diff options
| author | Jeremy Hinegardner <jeremy@copiousfreetime.org> | 2013-03-23 23:15:31 -0600 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-05-17 10:04:45 +0200 |
| commit | 28e6b7b9b4e0a6ec05575cffedd56e1319f8691f (patch) | |
| tree | fe854ef7896c80d9eca715d45229b0a9a2372395 | |
| parent | 17989dcf540c13a7122663f64c09dc830ffc3a41 (diff) | |
Turn off usage of base_data_offset in tfhd for PIFF files
According to the PIFF specification[1] the base_data_offset field MUST be
omitteed. See section 5.2.17. Since the ISMV files created by ffmpeg state
that they are 'piff' compatible via 'ftyp' box, this needs to be corrected.
[1] http://www.iis.net/learn/media/smooth-streaming/protected-interoperable-file-format
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
| -rw-r--r-- | libavformat/movenc.c | 6 | ||||
| -rw-r--r-- | tests/ref/lavf/ismv | 12 |
2 files changed, 10 insertions, 8 deletions
diff --git a/libavformat/movenc.c b/libavformat/movenc.c index 8b3ad7f387..594f22bd7d 100644 --- a/libavformat/movenc.c +++ b/libavformat/movenc.c @@ -2505,9 +2505,11 @@ static int mov_write_tfhd_tag(AVIOContext *pb, MOVTrack *track, /* Don't set a default sample size, the silverlight player refuses * to play files with that set. Don't set a default sample duration, - * WMP freaks out if it is set. */ + * WMP freaks out if it is set. Don't set a base data offset, PIFF + * file format says it MUST NOT be set. */ if (track->mode == MODE_ISM) - flags &= ~(MOV_TFHD_DEFAULT_SIZE | MOV_TFHD_DEFAULT_DURATION); + flags &= ~(MOV_TFHD_DEFAULT_SIZE | MOV_TFHD_DEFAULT_DURATION | + MOV_TFHD_BASE_DATA_OFFSET); avio_wb32(pb, 0); /* size placeholder */ ffio_wfourcc(pb, "tfhd"); diff --git a/tests/ref/lavf/ismv b/tests/ref/lavf/ismv index 6f9f57be22..05bb575ccd 100644 --- a/tests/ref/lavf/ismv +++ b/tests/ref/lavf/ismv @@ -1,9 +1,9 @@ -a24a0426b5f8dc896daaf18502e38790 *./tests/data/lavf/lavf.ismv -312263 ./tests/data/lavf/lavf.ismv +3a2563358cc91017fc96f9e690f26b85 *./tests/data/lavf/lavf.ismv +312255 ./tests/data/lavf/lavf.ismv ./tests/data/lavf/lavf.ismv CRC=0x9d9a638a -1b98502911dd19a9792777de67922db2 *./tests/data/lavf/lavf.ismv -321189 ./tests/data/lavf/lavf.ismv +77dec1248e2c4d3b2b44dfe6bd27149a *./tests/data/lavf/lavf.ismv +321181 ./tests/data/lavf/lavf.ismv ./tests/data/lavf/lavf.ismv CRC=0xe8130120 -a24a0426b5f8dc896daaf18502e38790 *./tests/data/lavf/lavf.ismv -312263 ./tests/data/lavf/lavf.ismv +3a2563358cc91017fc96f9e690f26b85 *./tests/data/lavf/lavf.ismv +312255 ./tests/data/lavf/lavf.ismv ./tests/data/lavf/lavf.ismv CRC=0x9d9a638a |