ffmpeg | branch: master | Michael Niedermayer <michae...@gmx.at> | Thu Aug 14
01:02:26 2014 +0200| [0de0c75ebbecfa86f7c3a12f0cf748e79d221513] | committer:
Michael Niedermayer
Merge commit '30e50c50274f88f0f5ae829f401cd3c7f5266719'
* commit '30e50c50274f88f0f5ae829f401cd3c7f5266719':
lavf: eliminate ff_get_audio_frame_size()
Conflicts:
libavformat/utils.c
Not merged as the removed code is needed for some bugfixes and
would break the fate tests
Merged-by: Michael Niedermayer <michae...@gmx.at>
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=0de0c75ebbecfa86f7c3a12f0cf748e79d221513
---
_______________________________________________
ffmpeg-cvslog mailing list
ffmpeg-cvslog@ffmpeg.org
http://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog
