diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2011-08-26 01:29:40 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2011-08-26 01:29:40 +0200 |
| commit | 876d1d796bd80c75e3e6a7a458e3143cfe5c9474 (patch) | |
| tree | 949cc4c9120dc58512d84998adcb949d173cd9c0 /libavformat/mov.c | |
| parent | 7c4e4c6a0664bf668f4b7766a06f30096e0601f3 (diff) | |
| parent | f913eeea43078b3b9052efd8d8d29e7b29b39208 (diff) | |
| download | ffmpeg-876d1d796bd80c75e3e6a7a458e3143cfe5c9474.tar.gz | |
Merge remote-tracking branch 'qatar/master'
* qatar/master:
vp6: partially propagate huffman tree building errors during coeff model parsing and fix misspelling
mpeg12: propagate chunk decode errors and fix conditional indentation
vc1: fix VC-1 Pulldown handling.
VC1: Fix first/last row checks with slices
mp4: Handle non-trivial ES Descriptors.
vc1: properly zero coded_block[] edges on new slice entry.
Conflicts:
libavcodec/vc1dec.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavformat/mov.c')
| -rw-r--r-- | libavformat/mov.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/libavformat/mov.c b/libavformat/mov.c index 96a99280e1..2663aa0221 100644 --- a/libavformat/mov.c +++ b/libavformat/mov.c @@ -478,8 +478,7 @@ int ff_mov_read_esds(AVFormatContext *fc, AVIOContext *pb, MOVAtom atom) avio_rb32(pb); /* version + flags */ ff_mp4_read_descr(fc, pb, &tag); if (tag == MP4ESDescrTag) { - avio_rb16(pb); /* ID */ - avio_r8(pb); /* priority */ + ff_mp4_parse_es_descr(pb, NULL); } else avio_rb16(pb); /* ID */ |