diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2012-10-30 16:45:44 +0400 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2012-10-30 16:52:03 +0400 |
| commit | cd37963684d8ee9819af15ccebe09d84839101dd (patch) | |
| tree | 33c99132f79f095301b4e453c40f0b77005f5b1d /libavfilter/af_ashowinfo.c | |
| parent | 60e957476e338a200501e0bdad40b7bf0076b268 (diff) | |
| parent | 381dc1a5ec0925b281c573457c413ae643567086 (diff) | |
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@gmx.at>
Diffstat (limited to 'libavfilter/af_ashowinfo.c')
0 files changed, 0 insertions, 0 deletions