diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-09-14 10:26:56 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-09-14 10:26:56 +0200 |
| commit | d06dda65b499458761d23d9580fdcaa451ba96f5 (patch) | |
| tree | bfcbed6d5b9353d2941b6182f30ce6416f95d90e /libavcodec/ac3_parser.h | |
| parent | f4392277b02e9cb991ef8ffc618c0019661a4573 (diff) | |
| parent | 139f352daf84e005824562e0e0f36e06ac60ee36 (diff) | |
| download | ffmpeg-d06dda65b499458761d23d9580fdcaa451ba96f5.tar.gz | |
Merge commit '139f352daf84e005824562e0e0f36e06ac60ee36' into release/0.10
* commit '139f352daf84e005824562e0e0f36e06ac60ee36':
wtv: Mark attachment with a negative stream id
avidec: Let the inner dv demuxer take care of discarding
Conflicts:
libavformat/wtv.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/ac3_parser.h')
0 files changed, 0 insertions, 0 deletions