[FFmpeg-cvslog] Merge commit '381dc1a5ec0925b281c573457c413ae643567086'
Michael Niedermayer
git at videolan.org
Tue Oct 30 13:56:25 CET 2012
ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Tue Oct 30 13:45:44 2012 +0100| [cd37963684d8ee9819af15ccebe09d84839101dd] | committer: Michael Niedermayer
Merge commit '381dc1a5ec0925b281c573457c413ae643567086'
* commit '381dc1a5ec0925b281c573457c413ae643567086':
fate: ac3: Place E-AC-3 tests and AC-3 tests in different groups
fate: Add shorthands for acodec PCM and ADPCM tests
avconv: Drop unused function argument from do_video_stats()
cmdutils: Conditionally compile libswscale-related bits
aacenc: Drop some unused function arguments
rtsp: Avoid a cast when calling strtol
nut: support textual data
nutenc: verbosely report unsupported negative pts
Conflicts:
cmdutils.c
ffmpeg.c
libavformat/nut.c
libavformat/nutenc.c
Merged-by: Michael Niedermayer <michaelni at gmx.at>
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=cd37963684d8ee9819af15ccebe09d84839101dd
---
More information about the ffmpeg-cvslog
mailing list