[FFmpeg-cvslog] Merge commit 'c692957c4edd119920cd7f2121628dd183589e6a'
Michael Niedermayer
git at videolan.org
Tue Oct 23 14:56:36 CEST 2012
ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Tue Oct 23 14:50:31 2012 +0200| [d0ac26a264e5b9d5d7d19efddd7205faf1e124d4] | committer: Michael Niedermayer
Merge commit 'c692957c4edd119920cd7f2121628dd183589e6a'
* commit 'c692957c4edd119920cd7f2121628dd183589e6a':
lavu: remove disabled avoptions cruft
lavu: remove disabled FF_API_GET_BITS_PER_SAMPLE_FMT cruft
Conflicts:
libavutil/opt.c
libavutil/opt.h
libavutil/version.h
Merged-by: Michael Niedermayer <michaelni at gmx.at>
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=d0ac26a264e5b9d5d7d19efddd7205faf1e124d4
---
More information about the ffmpeg-cvslog
mailing list