diff options
| author | Carl Eugen Hoyos <cehoyos@ag.or.at> | 2012-07-25 09:26:17 +0200 |
|---|---|---|
| committer | Carl Eugen Hoyos <cehoyos@ag.or.at> | 2012-07-25 09:26:17 +0200 |
| commit | 20e88d86182d9bb49112648d9a42849a7b17eacd (patch) | |
| tree | 62968b71a8526abd596024e128e81160d6524044 /libavformat | |
| parent | 1c2beff04a661b398266a8655c6e55ab47791002 (diff) | |
| download | ffmpeg-20e88d86182d9bb49112648d9a42849a7b17eacd.tar.gz | |
Fix avui stream-copy.
The native decoder and MPlayer's binary decoder only need the
APRG atom, QuickTime at least requires also the ARES atom and
four additional 0 bytes padding at the end of stsd.
Diffstat (limited to 'libavformat')
| -rw-r--r-- | libavformat/mov.c | 6 | ||||
| -rw-r--r-- | libavformat/movenc.c | 5 |
2 files changed, 7 insertions, 4 deletions
diff --git a/libavformat/mov.c b/libavformat/mov.c index b4295f8948..1646c6330c 100644 --- a/libavformat/mov.c +++ b/libavformat/mov.c @@ -939,7 +939,7 @@ static int mov_read_jp2h(MOVContext *c, AVIOContext *pb, MOVAtom atom) return mov_read_extradata(c, pb, atom, CODEC_ID_JPEG2000); } -static int mov_read_aprg(MOVContext *c, AVIOContext *pb, MOVAtom atom) +static int mov_read_avid(MOVContext *c, AVIOContext *pb, MOVAtom atom) { return mov_read_extradata(c, pb, atom, CODEC_ID_AVUI); } @@ -2548,7 +2548,9 @@ static int mov_read_tref(MOVContext *c, AVIOContext *pb, MOVAtom atom) } static const MOVParseTableEntry mov_default_parse_table[] = { -{ MKTAG('A','P','R','G'), mov_read_aprg }, +{ MKTAG('A','C','L','R'), mov_read_avid }, +{ MKTAG('A','P','R','G'), mov_read_avid }, +{ MKTAG('A','R','E','S'), mov_read_avid }, { MKTAG('a','v','s','s'), mov_read_avss }, { MKTAG('c','h','p','l'), mov_read_chpl }, { MKTAG('c','o','6','4'), mov_read_stco }, diff --git a/libavformat/movenc.c b/libavformat/movenc.c index 3fd5cce4f1..d2347e7fb3 100644 --- a/libavformat/movenc.c +++ b/libavformat/movenc.c @@ -1072,9 +1072,10 @@ static int mov_write_video_tag(AVIOContext *pb, MOVTrack *track) mov_write_d263_tag(pb); else if(track->enc->codec_id == CODEC_ID_SVQ3) mov_write_svq3_tag(pb); - else if(track->enc->codec_id == CODEC_ID_AVUI) + else if(track->enc->codec_id == CODEC_ID_AVUI) { mov_write_extradata_tag(pb, track); - else if(track->enc->codec_id == CODEC_ID_DNXHD) + avio_wb32(pb, 0); + } else if(track->enc->codec_id == CODEC_ID_DNXHD) mov_write_avid_tag(pb, track); else if(track->enc->codec_id == CODEC_ID_H264) { mov_write_avcc_tag(pb, track); |