Revision 26f86eaf

View differences:

libavformat/movenc.c
1316 1316
        put_tag(pb, "3g2a");
1317 1317
    else if ( mov->mode == MODE_PSP )
1318 1318
        put_tag(pb, "MSNV");
1319
    else
1319
    else if ( mov->mode == MODE_MP4 )
1320 1320
        put_tag(pb, "isom");
1321
    else
1322
        put_tag(pb, "qt  ");
1321 1323

  
1322 1324
    put_be32(pb, 0x200 );
1323 1325

  
......
1327 1329
        put_tag(pb, "3g2a");
1328 1330
    else if ( mov->mode == MODE_PSP )
1329 1331
        put_tag(pb, "MSNV");
1330
    else
1332
    else if ( mov->mode == MODE_MP4 )
1331 1333
        put_tag(pb, "mp41");
1334
    else
1335
        put_tag(pb, "qt  ");
1332 1336
}
1333 1337

  
1334 1338
static void mov_write_uuidprof_tag(ByteIOContext *pb, AVFormatContext *s)
......
1398 1402
        else if (!strcmp("mov", s->oformat->name)) mov->mode = MODE_MOV;
1399 1403
        else if (!strcmp("psp", s->oformat->name)) mov->mode = MODE_PSP;
1400 1404

  
1401
        if ( mov->mode == MODE_3GP || mov->mode == MODE_3G2 ||
1402
             mov->mode == MODE_MP4 || mov->mode == MODE_PSP )
1403
            mov_write_ftyp_tag(pb,s);
1405
        mov_write_ftyp_tag(pb,s);
1404 1406
        if ( mov->mode == MODE_PSP ) {
1405 1407
            if ( s->nb_streams != 2 ) {
1406 1408
                av_log(s, AV_LOG_ERROR, "PSP mode need one video and one audio stream\n");
tests/ffmpeg.regression.ref
137 137
7200000 ./data/a-dv.dv
138 138
c2082cd8adf417c4ebc32654e446cba1 *./data/out.yuv
139 139
stddev:  8.86 PSNR:29.17 bytes:7602176
140
733d55faec85f437f534771c145973d2 *./data/a-svq1.mov
141
1379827 ./data/a-svq1.mov
140
979057a09f280acd2fba3b29de6125d1 *./data/a-svq1.mov
141
1379847 ./data/a-svq1.mov
142 142
bbff871d1475e1eee4231a08e075de2c *./data/out.yuv
143 143
stddev: 10.99 PSNR:27.30 bytes:7602176
144 144
21f8ff9f1daacd9133683bb4ea0f50a4 *./data/a-mp2.mp2
tests/libav.regression.ref
22 22
794934a02582f8dfc85d1856514cf37c *./data/b-libav.flv
23 23
 339325 ./data/b-libav.flv
24 24
./data/b-libav.flv CRC=0x7b9076f8
25
4eecc0b7b09a6696f6d0f811f637612e *./data/b-libav.mov
26
 369873 ./data/b-libav.mov
25
63e05396e2d52135c4025ce14eb090a9 *./data/b-libav.mov
26
369893 ./data/b-libav.mov
27 27
./data/b-libav.mov CRC=0x48f5a90d
28 28
8bf16d40a2ec19fa36b124a928e47e23 *./data/b-libav.nut
29 29
 332358 ./data/b-libav.nut
tests/rotozoom.regression.ref
137 137
7200000 ./data/a-dv.dv
138 138
bb69dda7a84a5b166434e28e1243d3d1 *./data/out.yuv
139 139
stddev:  2.99 PSNR:38.59 bytes:7602176
140
e4896d19f536c420cb17fac162d1f95b *./data/a-svq1.mov
141
769527 ./data/a-svq1.mov
140
2905eb59262b093335b31df9f252c488 *./data/a-svq1.mov
141
769547 ./data/a-svq1.mov
142 142
44777d1ddbccd0ef7f8d08394465670c *./data/out.yuv
143 143
stddev:  3.44 PSNR:37.38 bytes:7602176
144 144
21f8ff9f1daacd9133683bb4ea0f50a4 *./data/a-mp2.mp2

Also available in: Unified diff