diff options
| author | Baptiste Coudurier <baptiste.coudurier@gmail.com> | 2008-06-09 19:56:45 +0000 |
|---|---|---|
| committer | Baptiste Coudurier <baptiste.coudurier@gmail.com> | 2008-06-09 19:56:45 +0000 |
| commit | b63ba850c1ba80776d4c04f64e1efd02e4f3c913 (patch) | |
| tree | 994f7a2d80246df730b4bf7e0d738969c7adaf02 | |
| parent | 0724373d2c54e17a2a41ee96b6bde8773ef84066 (diff) | |
| download | ffmpeg-b63ba850c1ba80776d4c04f64e1efd02e4f3c913.tar.gz | |
remove obsolete requirements, quicktime 6 is from 2002, not sure if muxing scheme still fits
Originally committed as revision 13732 to svn://svn.ffmpeg.org/ffmpeg/trunk
| -rw-r--r-- | libavformat/movenc.c | 18 | ||||
| -rw-r--r-- | tests/libav.regression.ref | 4 |
2 files changed, 4 insertions, 18 deletions
diff --git a/libavformat/movenc.c b/libavformat/movenc.c index db16f11869..89b835937c 100644 --- a/libavformat/movenc.c +++ b/libavformat/movenc.c @@ -1179,22 +1179,12 @@ static int mov_write_meta_tag(ByteIOContext *pb, MOVContext *mov, static int mov_write_udta_tag(ByteIOContext *pb, MOVContext *mov, AVFormatContext *s) { - int i, req = 0; - - /* Requirements */ - for (i=0; i<mov->nb_streams; i++) { - if(mov->tracks[i].entry <= 0) continue; - if (mov->tracks[i].enc->codec_id == CODEC_ID_AAC || - mov->tracks[i].enc->codec_id == CODEC_ID_MPEG4) { - req = 1; - break; - } - } + int i; if (s->title[0] || s->author[0] || s->album[0] || s->year || s->comment[0] || s->genre[0] || s->track || (mov->mode == MODE_MOV && - ((mov->tracks[0].enc && !mov->tracks[0].enc->flags & CODEC_FLAG_BITEXACT) || req))) { + (mov->tracks[0].enc && !mov->tracks[0].enc->flags & CODEC_FLAG_BITEXACT))) { offset_t pos = url_ftell(pb); put_be32(pb, 0); /* size */ @@ -1204,10 +1194,6 @@ static int mov_write_udta_tag(ByteIOContext *pb, MOVContext *mov, mov_write_meta_tag(pb, mov, s); if(mov->mode == MODE_MOV){ // the title field breaks gtkpod with mp4 and my suspicion is that stuff is not valid in mp4 - /* Requirements */ - if (req) - mov_write_string_tag(pb, "\251req", "QuickTime 6.0 or greater", 0); - mov_write_string_tag(pb, "\251nam", s->title , 0); mov_write_string_tag(pb, "\251aut", s->author , 0); mov_write_string_tag(pb, "\251alb", s->album , 0); diff --git a/tests/libav.regression.ref b/tests/libav.regression.ref index c68bc29ba6..8b019d05a4 100644 --- a/tests/libav.regression.ref +++ b/tests/libav.regression.ref @@ -21,8 +21,8 @@ bbdd9a4904eceb530b1a9ae02c48d76f *./tests/data/b-libav.ffm f8ad5bd78f4d012a8ce9570aa395ac54 *./tests/data/b-libav.flv 335833 ./tests/data/b-libav.flv ./tests/data/b-libav.flv CRC=0xe14e8847 -16518706f425cb537362bfc1c58b8de5 *./tests/data/b-libav.mov -366923 ./tests/data/b-libav.mov +af78858062599fcbba049e4a02588a15 *./tests/data/b-libav.mov +366879 ./tests/data/b-libav.mov ./tests/data/b-libav.mov CRC=0x45079dca 7820fa85ab86c62028d8dbda94589573 *./tests/data/b-libav.dv 3600000 ./tests/data/b-libav.dv |