highperfocused/ffmpeg
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

dont store mov style meta tags in mp4 (fixes ffmpeg -title + gtkpod)

Browse Source 
Originally committed as revision 5405 to svn://svn.ffmpeg.org/ffmpeg/trunk
This commit is contained in:
Michael Niedermayer 2006-05-18 23:32:42 +00:00
parent 6f276720ac
commit ed90d370ec
3 changed files with 10 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
libavformat/movenc.c
View File

@ -1185,6 +1185,7 @@ static int mov_write_udta_tag(ByteIOContext *pb, MOVContext* mov,
/* iTunes meta data */ /* iTunes meta data */
mov_write_meta_tag(pb, mov, s); 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 isnt valid in mp4
/* Requirements */ /* Requirements */
for (i=0; i<MAX_STREAMS; i++) { for (i=0; i<MAX_STREAMS; i++) {
if(mov->tracks[i].entry <= 0) continue; if(mov->tracks[i].entry <= 0) continue;
@ -1203,6 +1204,7 @@ static int mov_write_udta_tag(ByteIOContext *pb, MOVContext* mov,
mov_write_string_tag(pb, "\251enc", LIBAVFORMAT_IDENT, 0); mov_write_string_tag(pb, "\251enc", LIBAVFORMAT_IDENT, 0);
mov_write_string_tag(pb, "\251des", s->comment , 0); mov_write_string_tag(pb, "\251des", s->comment , 0);
mov_write_string_tag(pb, "\251gen", s->genre , 0); mov_write_string_tag(pb, "\251gen", s->genre , 0);
}
return updateSize(pb, pos); return updateSize(pb, pos);
} }

8
tests/ffmpeg.regression.ref
View File

@ -59,8 +59,8 @@ fc01a5723a0d629bb73c74d64692120d *./data/a-h263p.avi
2414342 ./data/a-h263p.avi 2414342 ./data/a-h263p.avi
28fd12ac0b168252d81df6f6e60a5d17 *./data/out.yuv 28fd12ac0b168252d81df6f6e60a5d17 *./data/out.yuv
stddev: 2.07 PSNR:41.76 bytes:7602176 stddev: 2.07 PSNR:41.76 bytes:7602176
ace6c1cd13693c402317dcef741db64d *./data/a-odivx.mp4 26bbeee40bd124d981e8fbfc5b8bee16 *./data/a-odivx.mp4
554535 ./data/a-odivx.mp4 554499 ./data/a-odivx.mp4
57aed19df5cbada4b05991527ee72ebe *./data/out.yuv 57aed19df5cbada4b05991527ee72ebe *./data/out.yuv
stddev: 7.99 PSNR:30.06 bytes:7602176 stddev: 7.99 PSNR:30.06 bytes:7602176
8a9a98678a2e9c2e857f741cbb8e9ccb *./data/a-huffyuv.avi 8a9a98678a2e9c2e857f741cbb8e9ccb *./data/a-huffyuv.avi
@ -83,8 +83,8 @@ a316960921c77d88817d857bbe19dccd *./data/a-mpeg4-Q.avi
899452 ./data/a-mpeg4-Q.avi 899452 ./data/a-mpeg4-Q.avi
af59c063ed644c7dc4151a0a2debbddd *./data/out.yuv af59c063ed644c7dc4151a0a2debbddd *./data/out.yuv
stddev: 5.69 PSNR:33.00 bytes:7602176 stddev: 5.69 PSNR:33.00 bytes:7602176
28446a8cc5f1cfc337415f408ab67f0e *./data/a-mpeg4-PSP.mp4 8ca360db66f3d801a748a7d4fbd9cab1 *./data/a-mpeg4-PSP.mp4
407349 ./data/a-mpeg4-PSP.mp4 407313 ./data/a-mpeg4-PSP.mp4
40f1b11c7c5c114af109ef4ea6a7097d *./data/a-error-mpeg4-adv.avi 40f1b11c7c5c114af109ef4ea6a7097d *./data/a-error-mpeg4-adv.avi
766682 ./data/a-error-mpeg4-adv.avi 766682 ./data/a-error-mpeg4-adv.avi
e90b201e20563ec7817f5dc4276902ed *./data/out.yuv e90b201e20563ec7817f5dc4276902ed *./data/out.yuv

8
tests/rotozoom.regression.ref
View File

@ -59,8 +59,8 @@ stddev: 5.44 PSNR:33.41 bytes:7602176
868164 ./data/a-h263p.avi 868164 ./data/a-h263p.avi
80fb224bebbe2e04f228da7485b905c5 *./data/out.yuv 80fb224bebbe2e04f228da7485b905c5 *./data/out.yuv
stddev: 1.91 PSNR:42.49 bytes:7602176 stddev: 1.91 PSNR:42.49 bytes:7602176
059f0bc4e2f7e454620f619a0295fecb *./data/a-odivx.mp4 f69bd330fd11c8f0943ab329d3099dc7 *./data/a-odivx.mp4
120186 ./data/a-odivx.mp4 120150 ./data/a-odivx.mp4
e8c90899c32e11e7e4d1354dab0b8f28 *./data/out.yuv e8c90899c32e11e7e4d1354dab0b8f28 *./data/out.yuv
stddev: 5.34 PSNR:33.56 bytes:7602176 stddev: 5.34 PSNR:33.56 bytes:7602176
4a8912deb0182471aaaf4fc3ece39fb2 *./data/a-huffyuv.avi 4a8912deb0182471aaaf4fc3ece39fb2 *./data/a-huffyuv.avi
@ -83,8 +83,8 @@ e3297036902923727157b8d1b52cbc7e *./data/a-mpeg4-Q.avi
164998 ./data/a-mpeg4-Q.avi 164998 ./data/a-mpeg4-Q.avi
b078f22c66083f0537bd3581509684d8 *./data/out.yuv b078f22c66083f0537bd3581509684d8 *./data/out.yuv
stddev: 4.01 PSNR:36.05 bytes:7602176 stddev: 4.01 PSNR:36.05 bytes:7602176
1a3e5c4b097c7609415248e235f39967 *./data/a-mpeg4-PSP.mp4 5c1423bbabf985fac5887d76f0b833f1 *./data/a-mpeg4-PSP.mp4
321922 ./data/a-mpeg4-PSP.mp4 321886 ./data/a-mpeg4-PSP.mp4
a2adfb70459e8b2218756bac5e67c4c7 *./data/a-error-mpeg4-adv.avi a2adfb70459e8b2218756bac5e67c4c7 *./data/a-error-mpeg4-adv.avi
177212 ./data/a-error-mpeg4-adv.avi 177212 ./data/a-error-mpeg4-adv.avi
9fa0943825f364d6fb700dc75cf5d8bb *./data/out.yuv 9fa0943825f364d6fb700dc75cf5d8bb *./data/out.yuv