diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-07-15 14:08:06 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-07-15 14:08:06 +0200 |
| commit | fcbf16a76f3524189e4a6aa93db7147a4b367e10 (patch) | |
| tree | ad67c533df3790283596e7d0ea7567e81351ff87 /libavformat/m4vdec.c | |
| parent | c4b904caeaa7664870030c3015e1593f90112c9c (diff) | |
| parent | 5b2a29552ca09edd4646b6aa1828b32912b7ab36 (diff) | |
| download | ffmpeg-fcbf16a76f3524189e4a6aa93db7147a4b367e10.tar.gz | |
Merge remote-tracking branch 'qatar/master'
* qatar/master:
indeo: Reject impossible FRAMETYPE_NULL
Conflicts:
libavcodec/ivi_common.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavformat/m4vdec.c')
0 files changed, 0 insertions, 0 deletions