Statistics
| Branch: | Revision:

ffmpeg / libavformat / mov.c @ e356fc57

History | View | Annotate | Download (86 KB)

# Date Author Comment
e356fc57 03/01/2011 05:22 PM Anton Khirnov

lavf: replace all uses of url_fskip with avio_seek

Signed-off-by: Ronald S. Bultje <>

6b4aa5da 03/01/2011 05:12 PM Anton Khirnov

avio: avio_ prefix for url_fseek

Signed-off-by: Ronald S. Bultje <>

22a3212e 02/23/2011 03:18 PM Anton Khirnov

avio: rename url_fopen/fclose -> avio_open/close.

Signed-off-by: Ronald S. Bultje <>

b7effd4e 02/21/2011 04:23 PM Anton Khirnov

avio: avio_ prefixes for get_* functions

In the name of consistency:
get_byte -> avio_r8
get_<type> -> avio_r<type>
get_buffer -> avio_read

get_partial_buffer will be made private later

get_strz is left out becase I want to change it later to return...

e731b8d8 02/20/2011 01:37 PM Anton Khirnov

avio: move init_put_byte() to a new private header and rename it

init_put_byte should never be used outside of lavf, since
sizeof(AVIOContext) isn't part of public ABI.

Signed-off-by: Ronald S. Bultje <>

ae628ec1 02/20/2011 01:37 PM Anton Khirnov

avio: rename ByteIOContext to AVIOContext.

Signed-off-by: Ronald S. Bultje <>

628b16f4 02/10/2011 02:17 PM Mans Rullgard

mov: remove stray semicolon

Signed-off-by: Mans Rullgard <>

ed19fafd 02/06/2011 09:05 PM Sascha Sommer

pass QDMC extradata to the decoder

Makes playing QDMC files in MPlayer work when using the libavformat demuxer.
Problem was that the extradata was not passed from demuxer to decoder.

Signed-off-by: Ronald S. Bultje <>

dfd2a005 01/29/2011 10:55 PM Luca Barbato

Replace dprintf with av_dlog

dprintf clashes with POSIX.1-2008

97b04f5e 01/28/2011 12:06 AM John Stebbins

mov: add support for little-endian utf16 chapter names

Signed-off-by: Janne Grunau <>

f2589642 01/28/2011 12:06 AM Baptiste Coudurier

In mov muxer, mux adpcm_ms and adpcm_ima_wav the way quicktime supports it

In mov demuxer, set adpcm_ms and adpcm_ima_wav frame size to stsd samples per packet.

Signed-off-by: Janne Grunau <>

c6610a21 01/26/2011 10:10 PM Diego Elio Pettenò

Prefix all _demuxer, _muxer, _protocol from libavformat and libavdevice.

This also lists the objects from those two libraries as internal (by adding
the ff_ prefix) so that they can then be hidden via linker scripts.

225b6d7f 01/26/2011 10:03 PM Anton Khirnov

mov: simplify mov_read_chapters() by using avio_get_str16be

It probably also fixes a memleak or two.

Signed-off-by: Mans Rullgard <>

c4f8765a 01/26/2011 10:03 PM Mans Rullgard

Revert "mov: simplify mov_read_chapters() by using avio_get_str16be"

This reverts commit c34461b35b68ff1f3d04540e0279383c51be8cee.
The wrong version of the patch was committed.

c34461b3 01/25/2011 08:48 PM Anton Khirnov

mov: simplify mov_read_chapters() by using avio_get_str16be

It probably also fixes a memleak or two.

Signed-off-by: Janne Grunau <>

c3024f9e 01/11/2011 09:06 PM Baptiste Coudurier

In mov demuxer, handle better wrong time scale, fix issue #2528

Originally committed as revision 26311 to svn://svn.ffmpeg.org/ffmpeg/trunk

f6253caf 01/11/2011 07:58 PM Baptiste Coudurier

In mov demuxer, set r_frame_rate for cfr files

Originally committed as revision 26310 to svn://svn.ffmpeg.org/ffmpeg/trunk

5e2202d6 01/05/2011 07:21 PM Baptiste Coudurier

In mov demuxer, check that gmtime returns a valid value, fix crash, issue #2490

Originally committed as revision 26228 to svn://svn.ffmpeg.org/ffmpeg/trunk

4af7166f 01/05/2011 07:14 PM Baptiste Coudurier

In mov demuxer, check that stts data exists, fix crash, issue #2479

Originally committed as revision 26227 to svn://svn.ffmpeg.org/ffmpeg/trunk

c6f1e29a 12/07/2010 01:38 AM Baptiste Coudurier

In mov demuxer, read alac sample from extradata, fix #2406

Originally committed as revision 25901 to svn://svn.ffmpeg.org/ffmpeg/trunk

adc73054 11/25/2010 05:03 AM Baptiste Coudurier

In mov demuxer, if multiple h264 stsd are present, do not concatenate streams, fix #2069

Originally committed as revision 25825 to svn://svn.ffmpeg.org/ffmpeg/trunk

798c6fac 11/23/2010 12:51 AM Baptiste Coudurier

In ts demuxer, support aac flexmux using extradata in iods, issue #2346

Originally committed as revision 25806 to svn://svn.ffmpeg.org/ffmpeg/trunk

7df22143 11/21/2010 07:02 PM Aurelien Jacobs

movdec: export creation_date as metadata

Originally committed as revision 25786 to svn://svn.ffmpeg.org/ffmpeg/trunk

2b91d83e 11/16/2010 05:55 AM Baptiste Coudurier

In mov demuxer, export .mov encoder metadata tag

Originally committed as revision 25757 to svn://svn.ffmpeg.org/ffmpeg/trunk

2f412421 10/05/2010 09:36 PM Martin Storsjö

movdec: Free the previous extradata

If multiple stsd atoms are parsed for the same stream, the old
extradata would be leaked.

Originally committed as revision 25360 to svn://svn.ffmpeg.org/ffmpeg/trunk

dc2cabd0 10/05/2010 09:35 PM Martin Storsjö

movdec: Split out ff_mov_read_stsd

Originally committed as revision 25359 to svn://svn.ffmpeg.org/ffmpeg/trunk

6d19fd5c 09/28/2010 12:33 AM Baptiste Coudurier

In mov demuxer, check that nb_streams is valid before using it in read_dac3

Originally committed as revision 25240 to svn://svn.ffmpeg.org/ffmpeg/trunk

0e7d436d 09/08/2010 08:20 PM Baptiste Coudurier

Check dref size based on a patch by google

Originally committed as revision 25081 to svn://svn.ffmpeg.org/ffmpeg/trunk

9044dd83 09/08/2010 08:18 PM Baptiste Coudurier

In mov demuxer, do not override aspect ratio in tkhd by pasp like quicktime, fix issue #1539

Originally committed as revision 25080 to svn://svn.ffmpeg.org/ffmpeg/trunk

bdecdd2b 09/06/2010 09:52 PM Justin Ruggles

Read the number of channels from the 'dac3' tag for AC-3 in MP4.

Originally committed as revision 25054 to svn://svn.ffmpeg.org/ffmpeg/trunk

8fc0162a 07/10/2010 10:12 PM Måns Rullgård

Add av_ prefix to bswap macros

Originally committed as revision 24170 to svn://svn.ffmpeg.org/ffmpeg/trunk

105b3785 07/04/2010 04:59 AM David Conrad

mov: Read Flash's chpl variant

This is based off of F4V specs rather than any actual files

Originally committed as revision 24035 to svn://svn.ffmpeg.org/ffmpeg/trunk

380966a8 07/02/2010 08:24 AM John Stebbins

In mov demuxer, fix seeking to the beginning when file has edit lists.
Patch by John Stebbins, stebbins at jetheaddev dot com
Fixes issue #2046

Originally committed as revision 23966 to svn://svn.ffmpeg.org/ffmpeg/trunk

525fcb27 07/01/2010 11:18 PM Andrew Wason

In mov demuxer, only set sar if not already set, patch by Andrew Wason,
rectalogic at rectalogic dot com
Fixes issue #1754

Originally committed as revision 23948 to svn://svn.ffmpeg.org/ffmpeg/trunk

7d6096e4 07/01/2010 10:31 PM Baptiste Coudurier

Use ext sample from mpeg4audio config if set with AAC SBR

Originally committed as revision 23947 to svn://svn.ffmpeg.org/ffmpeg/trunk

2209ffac 06/28/2010 09:02 PM Baptiste Coudurier

In mov demuxer, increase total size after debugging message

Originally committed as revision 23864 to svn://svn.ffmpeg.org/ffmpeg/trunk

3491866a 06/25/2010 01:19 AM Baptiste Coudurier

Improve mov atom parsing debug message, print parent atom and size in decimal

Originally committed as revision 23764 to svn://svn.ffmpeg.org/ffmpeg/trunk

ea4c4d7f 05/23/2010 09:03 PM Baptiste Coudurier

change author metadata to artist in mov de/muxer

Originally committed as revision 23266 to svn://svn.ffmpeg.org/ffmpeg/trunk

1cf9f6ed 05/05/2010 08:41 AM David Conrad

mov: Read nero chapters

Originally committed as revision 23020 to svn://svn.ffmpeg.org/ffmpeg/trunk

2ef6c124 04/25/2010 02:27 PM Stefano Sabatini

Mark av_metadata_set() as deprecated, and use av_metadata_set2()
in its place.

av_metadata_set() is going to be dropped at the next major bump.

Originally committed as revision 22961 to svn://svn.ffmpeg.org/ffmpeg/trunk

7221579b 04/21/2010 06:36 AM David Conrad

mov: Read QuickTime chapters

Originally committed as revision 22928 to svn://svn.ffmpeg.org/ffmpeg/trunk

653d7aeb 04/16/2010 08:36 PM Martin Storsjö

Parse strf mov atoms

This fixes roundup issue 1270.

Originally committed as revision 22894 to svn://svn.ffmpeg.org/ffmpeg/trunk

cc947f04 03/31/2010 12:29 PM Jean-Daniel Dupas

Replace all occurences of PKT_FLAG_KEY with AV_PKT_FLAG_KEY.

Patch by Jean-Daniel Dupas, devlists shadowlab org

Originally committed as revision 22744 to svn://svn.ffmpeg.org/ffmpeg/trunk

72415b2a 03/30/2010 11:30 PM Stefano Sabatini

Define AVMediaType enum, and use it instead of enum CodecType, which
is deprecated and will be dropped at the next major bump.

Originally committed as revision 22735 to svn://svn.ffmpeg.org/ffmpeg/trunk

08a186c6 03/09/2010 01:03 AM Baptiste Coudurier

In mov demuxer, convert mac encoded strings to utf-8

Originally committed as revision 22365 to svn://svn.ffmpeg.org/ffmpeg/trunk

987e857f 03/09/2010 12:46 AM Baptiste Coudurier

Preallocate index entries in mov demuxer, huge speedup

Originally committed as revision 22363 to svn://svn.ffmpeg.org/ffmpeg/trunk

998257bd 02/28/2010 01:51 AM Carl Eugen Hoyos

Make mp4_read_descr static: It is only used inside libavformat/mov.c.

Originally committed as revision 22097 to svn://svn.ffmpeg.org/ffmpeg/trunk

bbdf0d22 02/20/2010 10:57 PM Michael Niedermayer

Make sure we dont write more bytes into filename than the array is long.
just a precaution in case the size of the source array is increased or
made dynamically allocateable.

Originally committed as revision 21926 to svn://svn.ffmpeg.org/ffmpeg/trunk

6a245905 02/20/2010 10:48 PM Michael Niedermayer

Do not attempt to open references through absolute pathes.
This would allow an attacker to test remotely if a local file exists.

Originally committed as revision 21925 to svn://svn.ffmpeg.org/ffmpeg/trunk

ca76a119 02/01/2010 11:39 AM Anton Khirnov

Add a list of generic tags and change demuxers to follow it.
Patch by Anton Khirnov, wyskas at gmail dot com

Originally committed as revision 21587 to svn://svn.ffmpeg.org/ffmpeg/trunk

895a9be6 01/24/2010 09:37 PM Carl Eugen Hoyos

Force codec_tag I420 for Quicktime Planar Y'CbCr 8-bit 4:2:0 raw codec,
because YV12 triggers an UV swap in rawdec.c, fixes issue 1687.

Originally committed as revision 21436 to svn://svn.ffmpeg.org/ffmpeg/trunk

49c43fc2 01/18/2010 11:58 PM Baptiste Coudurier

reindent

Originally committed as revision 21311 to svn://svn.ffmpeg.org/ffmpeg/trunk

c3aeaa54 01/18/2010 11:56 PM Baptiste Coudurier

set average frame rate in mov demuxer

Originally committed as revision 21310 to svn://svn.ffmpeg.org/ffmpeg/trunk

c9566115 01/18/2010 09:38 PM Baptiste Coudurier

move aspect ratio code at the end of the track parsing, fix cathedral-beta2-400extra-crop-avc.mp4

Originally committed as revision 21301 to svn://svn.ffmpeg.org/ffmpeg/trunk

ff5ab5c8 01/14/2010 12:32 AM Andrew Wason

set stream aspect from mov tkhd width/height, patch by Andrew Wason, rectalogic at rectalogic dot com
Fixes issue 671.

Originally committed as revision 21210 to svn://svn.ffmpeg.org/ffmpeg/trunk

49544546 01/13/2010 11:33 PM Baptiste Coudurier

do not skip mdat data if it's the last atom, avoids one seek

Originally committed as revision 21209 to svn://svn.ffmpeg.org/ffmpeg/trunk

7b1312fa 01/04/2010 10:59 PM Baptiste Coudurier

cosmetics, remove useless parentheses, add space

Originally committed as revision 21025 to svn://svn.ffmpeg.org/ffmpeg/trunk

a510991c 01/04/2010 10:58 PM Baptiste Coudurier

simplify error handling in mov_read_default

Originally committed as revision 21024 to svn://svn.ffmpeg.org/ffmpeg/trunk

cb41b2b6 01/04/2010 10:51 PM Baptiste Coudurier

remove no more needed MOVAtom.offset field

Originally committed as revision 21023 to svn://svn.ffmpeg.org/ffmpeg/trunk

7ead7e21 01/04/2010 10:48 PM Baptiste Coudurier

remove useless code skipping data at end of hdlr atom, already done in mov_read_default

Originally committed as revision 21022 to svn://svn.ffmpeg.org/ffmpeg/trunk

6866dd12 11/27/2009 01:10 PM Jai Menon

Fix typo.

Originally committed as revision 20628 to svn://svn.ffmpeg.org/ffmpeg/trunk

b9c78bca 11/23/2009 08:47 AM David Conrad

MOV: cprt is another tag used for copyright

Originally committed as revision 20587 to svn://svn.ffmpeg.org/ffmpeg/trunk

7382902b 11/23/2009 08:47 AM David Conrad

MOV: Add several iTunes metadata tags

Originally committed as revision 20586 to svn://svn.ffmpeg.org/ffmpeg/trunk

e26df9eb 11/19/2009 09:03 PM Baptiste Coudurier

use AVFormatContext in dprintf

Originally committed as revision 20554 to svn://svn.ffmpeg.org/ffmpeg/trunk

adeb9071 11/15/2009 03:26 AM Baptiste Coudurier

Search relative path according to alias record when opening mov reference files.
Based on patch by Maksym Veremeyenko, verem at m1stereo dot tv

Originally committed as revision 20539 to svn://svn.ffmpeg.org/ffmpeg/trunk

ba278391 11/12/2009 02:22 AM Alex Converse

Debug print MP4 objectTypeIndication in hex not decimal as values are listed in
hex in all official documents.

Originally committed as revision 20523 to svn://svn.ffmpeg.org/ffmpeg/trunk

5aea268d 11/11/2009 08:24 PM Alex Converse

Add a channels field to MPEG4AudioConfig.

Originally committed as revision 20512 to svn://svn.ffmpeg.org/ffmpeg/trunk

a4cb56aa 11/06/2009 06:59 PM Baptiste Coudurier

change \0xa9enc tag metadata name to encoder to match id3v2

Originally committed as revision 20469 to svn://svn.ffmpeg.org/ffmpeg/trunk

bddc2df5 11/05/2009 08:53 AM Baptiste Coudurier

10l, typo

Originally committed as revision 20462 to svn://svn.ffmpeg.org/ffmpeg/trunk

c2564699 11/05/2009 07:32 AM Baptiste Coudurier

do not redundantly set stream nb_frames, it's already set in read_stts

Originally committed as revision 20459 to svn://svn.ffmpeg.org/ffmpeg/trunk

e7452721 11/05/2009 07:30 AM Baptiste Coudurier

compute dts shift with ctts value, cslg atom might be missing, fix #419

Originally committed as revision 20458 to svn://svn.ffmpeg.org/ffmpeg/trunk

fedb1eca 11/05/2009 07:17 AM Baptiste Coudurier

check that duration is set to avoid fpe

Originally committed as revision 20457 to svn://svn.ffmpeg.org/ffmpeg/trunk

507330b9 11/05/2009 07:11 AM Baptiste Coudurier

warn if stream timescale is not set and set it to 1 to avoid FPE

Originally committed as revision 20456 to svn://svn.ffmpeg.org/ffmpeg/trunk

55d2e32a 11/05/2009 01:40 AM Baptiste Coudurier

fix \0xa9wrt metadata, to composer, fix issue #1501

Originally committed as revision 20453 to svn://svn.ffmpeg.org/ffmpeg/trunk

c5898e86 10/24/2009 08:40 PM haim alon

compute codec bitrate in mov demuxer, patch by haim alon, haim dot alter at gmail dot com

Originally committed as revision 20368 to svn://svn.ffmpeg.org/ffmpeg/trunk

f2ad9070 09/30/2009 06:27 PM Reimar Döffinger

10l in code reading codec_name, the first byte is the length and should not
become part of the string.

Originally committed as revision 20102 to svn://svn.ffmpeg.org/ffmpeg/trunk

19635234 09/30/2009 09:43 AM Reimar Döffinger

Convert latin1 codec_name in mov to UTF-8, since all strings in FFmpeg
must be valid UTF-8.

Originally committed as revision 20092 to svn://svn.ffmpeg.org/ffmpeg/trunk

a42bf191 09/26/2009 09:06 PM Baptiste Coudurier

100l, typo

Originally committed as revision 20033 to svn://svn.ffmpeg.org/ffmpeg/trunk

7b5252ce 09/26/2009 08:51 PM haim alon

Export mov/mp4 major and compatible brands as metadata.
Patch by haim alon, haim dot alter at gmail dot com

Originally committed as revision 20032 to svn://svn.ffmpeg.org/ffmpeg/trunk

2d423666 09/16/2009 11:35 AM Peter Ross

Make mov LPCM and AAC parsing functions public

Originally committed as revision 19878 to svn://svn.ffmpeg.org/ffmpeg/trunk

e4bc8af1 09/07/2009 10:42 PM Baptiste Coudurier

check entries against field_size, potential malloc overflow in read_stsz, fix #1357

Originally committed as revision 19793 to svn://svn.ffmpeg.org/ffmpeg/trunk

1c4bf2ec 09/07/2009 10:36 PM Baptiste Coudurier

add one missing check for stream existence in read_elst, fix #1364

Originally committed as revision 19792 to svn://svn.ffmpeg.org/ffmpeg/trunk

d862fce7 06/25/2009 12:17 AM Baptiste Coudurier

only set par if it does not indicates a rotation, ex iphone 3GS

Originally committed as revision 19271 to svn://svn.ffmpeg.org/ffmpeg/trunk

e1c1b0ff 06/24/2009 09:40 AM Reimar Döffinger

Reindent after last patch.

Originally committed as revision 19265 to svn://svn.ffmpeg.org/ffmpeg/trunk

3fe4d5d4 06/24/2009 09:38 AM Reimar Döffinger

mov demuxer: Track the current position also for streams that have AVDISCARD_ALL set.
This allows for seamless switching of e.g. audio streams, with the previous code
playback started always from the beginning when removing AVDISCARD_ALL.

Originally committed as revision 19264 to svn://svn.ffmpeg.org/ffmpeg/trunk

5dc5c43b 06/24/2009 08:57 AM Reimar Döffinger

mov_read_packet: extract code that searches for the stream/sample to demux next
into a separate function.

Originally committed as revision 19263 to svn://svn.ffmpeg.org/ffmpeg/trunk

a2f38511 06/24/2009 08:50 AM Reimar Döffinger

mov_read_packet: if dv_get_packet fails, return exactly its error value
instead of always -1 (makes no real difference currently since dv_get_packet
always returns -1 so far).

Originally committed as revision 19262 to svn://svn.ffmpeg.org/ffmpeg/trunk

69fc436c 06/24/2009 08:23 AM Reimar Döffinger

In mov_read_packet remember the AVStream we want to demux next instead of the
MOVStreamContext. We need the AVStream anyway and it is easier to get the
MOVStreamContext from the AVStream than the other way around.

Originally committed as revision 19261 to svn://svn.ffmpeg.org/ffmpeg/trunk

6a63ff19 06/24/2009 03:38 AM Baptiste Coudurier

check stream existence before assignment, fix #1222

Originally committed as revision 19259 to svn://svn.ffmpeg.org/ffmpeg/trunk

1a40491e 06/22/2009 11:09 PM Daniel Verkamp

Add ff_ prefixes to exported symbols in libavformat/riff.h.
patch by Daniel Verkamp, aniel drv nu

Originally committed as revision 19254 to svn://svn.ffmpeg.org/ffmpeg/trunk

53e099de 06/15/2009 02:07 AM Baptiste Coudurier

check atom size against edit_count to avoid very long loop

Originally committed as revision 19198 to svn://svn.ffmpeg.org/ffmpeg/trunk

86b61d42 06/13/2009 12:50 AM David Conrad

Also accept TS as a prefix for wav twoccs (used by Flip4Mac) instead of
adding entries to codec_movaudio_tags.
This ensures ADPCM_IMA_WAV uses the standard ms prefix when muxing to mov
rather than TS.

Originally committed as revision 19177 to svn://svn.ffmpeg.org/ffmpeg/trunk

bbe46bc4 06/11/2009 05:13 AM Baptiste Coudurier

Remove time_rate, we cannot compute exactly when fragments are
used and we cannot determine if fragments are present or not in
streamed mode.

Originally committed as revision 19148 to svn://svn.ffmpeg.org/ffmpeg/trunk

28155113 06/03/2009 11:13 PM Baptiste Coudurier

broken stsd length might be < 16, fix elst-assert.mp4

Originally committed as revision 19084 to svn://svn.ffmpeg.org/ffmpeg/trunk

7e69621f 05/31/2009 04:36 AM Baptiste Coudurier

split audio chunks in mov demuxer

Originally committed as revision 19018 to svn://svn.ffmpeg.org/ffmpeg/trunk

350f2c2c 05/30/2009 06:15 AM Baptiste Coudurier

return AVERROR_EOF

Originally committed as revision 18992 to svn://svn.ffmpeg.org/ffmpeg/trunk

2d5fabc8 05/16/2009 04:08 AM Baptiste Coudurier

move increment after debug print

Originally committed as revision 18851 to svn://svn.ffmpeg.org/ffmpeg/trunk

171a3531 05/13/2009 08:31 AM Baptiste Coudurier

parse 'stps' atom to set keyframe, partial sync sample for mpeg-2 open gop

Originally committed as revision 18813 to svn://svn.ffmpeg.org/ffmpeg/trunk

41e64999 05/13/2009 07:57 AM Baptiste Coudurier

remove comment

Originally committed as revision 18811 to svn://svn.ffmpeg.org/ffmpeg/trunk

4b29ed39 05/13/2009 07:55 AM Baptiste Coudurier

Parse 'cslg' atom to retrieve dts shift when 'ctts' duration is negative.
We have now dts <= pts, note that for some B frames dts+1 == pts can happen
if a crappy timebase is used instead of correct /1001.

Originally committed as revision 18810 to svn://svn.ffmpeg.org/ffmpeg/trunk