Statistics
| Branch: | Revision:

ffmpeg / libavformat / isom.c @ 6cc7f139

History | View | Annotate | Download (20.1 KB)

# Date Author Comment
1b7ecc16 03/23/2011 11:30 AM Tomas Härdin

Add xd55 codec tag for XDCAM HD422 720p25 CBR files.

Signed-off-by: Ronald S. Bultje <>
2912e87a 03/19/2011 01:33 PM Mans Rullgard

Replace FFmpeg with Libav in licence headers

Signed-off-by: Mans Rullgard <>
35d7d6f7 03/11/2011 01:32 AM Benjamin Larsson

Add one more avc intra fourcc and extend the description

Signed-off-by: Ronald S. Bultje <>
8f935b92 02/22/2011 12:21 PM Benjamin Larsson

Add more AVC Intra FOURCCs

Also change the comments a bit since the FOURCCs aren't specific to Flip4Mac
and different ones are used for 720 versus 1080 lines.

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...
ae628ec1 02/20/2011 01:37 PM Anton Khirnov

avio: rename ByteIOContext to AVIOContext.

Signed-off-by: Ronald S. Bultje <>
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 <>
e65b1934 02/03/2011 11:40 AM Tomas Härdin

Add ProRes FOURCCs to isom.c

Signed-off-by: Mans Rullgard <>
aa42cce5 02/03/2011 10:21 AM Benjamin Larsson

Add AVC-Intra identifiers used by Flip4Mac for mov files

Signed-off-by: Mans Rullgard <>
dfd2a005 01/29/2011 10:55 PM Luca Barbato

Replace dprintf with av_dlog

dprintf clashes with POSIX.1-2008
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
c9b87628 10/04/2010 08:23 PM Baptiste Coudurier

xdcam hd422 720p24 fourcc in mov

Originally committed as revision 25336 to svn://svn.ffmpeg.org/ffmpeg/trunk
d8e45640 09/30/2010 06:12 PM Baptiste Coudurier

Correct tag is m2v1

Originally committed as revision 25271 to svn://svn.ffmpeg.org/ffmpeg/trunk
826481ea 09/29/2010 09:35 PM Baptiste Coudurier

Remove duplicate entries

Originally committed as revision 25264 to svn://svn.ffmpeg.org/ffmpeg/trunk
3432c263 09/29/2010 09:34 PM Baptiste Coudurier

Use new apple fourcc for mpeg-1 and mpeg-2 in mov, works natively on osx

Originally committed as revision 25263 to svn://svn.ffmpeg.org/ffmpeg/trunk
43836928 09/13/2010 10:08 PM Zhou Zongyi

Add R10k decoder.

Original patch by Zhou Zongyi, zhouzy A os pku edu cn, resubmitted by
James Darnley, james.darnley gmail, changes by me.

Originally committed as revision 25115 to svn://svn.ffmpeg.org/ffmpeg/trunk
9a191b3a 06/15/2010 09:14 AM Baptiste Coudurier

Support gray16be and rgb48be in mov

Originally committed as revision 23608 to svn://svn.ffmpeg.org/ffmpeg/trunk
414ba8e3 06/04/2010 11:31 PM Baptiste Coudurier

More mov rawvideo fourcc

Originally committed as revision 23480 to svn://svn.ffmpeg.org/ffmpeg/trunk
80b39e1c 05/22/2010 04:01 PM Francesco Lavra

Move AVCodecTag from riff.h into internal.h.

Patch by Francesco Lavra, francescolavra interfree it

Originally committed as revision 23250 to svn://svn.ffmpeg.org/ffmpeg/trunk
029ddf33 01/30/2010 10:05 PM Reimar Döffinger

Store strings directly in mov_mdhd_language_map instead of using pointers,
which has a up to 200% overhead.
Also allows to use memcpy instead of strcpy.

Originally committed as revision 21560 to svn://svn.ffmpeg.org/ffmpeg/trunk
1c90d298 01/30/2010 09:54 PM Reimar Döffinger

Always consider the mov language code as 4 bytes fixed size and change the
function declaration to reflect this.

Originally committed as revision 21558 to svn://svn.ffmpeg.org/ffmpeg/trunk
832ec428 01/30/2010 09:50 PM Reimar Döffinger

Simplify conversion to 5-bit ASCII.

Originally committed as revision 21557 to svn://svn.ffmpeg.org/ffmpeg/trunk
59ea69ef 01/15/2010 11:03 AM Carl Eugen Hoyos

Support decoding of Avid uncompressed mov files, fixes issue 1685.

Originally committed as revision 21223 to svn://svn.ffmpeg.org/ffmpeg/trunk
a0ae3e41 01/15/2010 10:55 AM Carl Eugen Hoyos

Support decoding Avid 1:1x codec, (partially) fixes issue1684.

Originally committed as revision 21222 to svn://svn.ffmpeg.org/ffmpeg/trunk
4aaab0a3 12/17/2009 06:56 PM Reimar Döffinger

Add decoder for R210 (uncompressed 10-bit RGB) codec.

Originally committed as revision 20891 to svn://svn.ffmpeg.org/ffmpeg/trunk
7c4b7d0f 11/29/2009 02:27 AM Baptiste Coudurier

support pcm_f32/64le in mov

Originally committed as revision 20649 to svn://svn.ffmpeg.org/ffmpeg/trunk
c3988a59 11/22/2009 06:13 PM Justin Ruggles

Add MP4 object type for ALS.

Originally committed as revision 20578 to svn://svn.ffmpeg.org/ffmpeg/trunk
42022e03 11/03/2009 04:17 PM Andrew Wason

add yuvs fourcc to raw.c and isom.c, fixes samples/mov/yuvs.mov
patch by Andrew Wason

Originally committed as revision 20439 to svn://svn.ffmpeg.org/ffmpeg/trunk
bc2d2a07 10/16/2009 02:46 PM Carl Eugen Hoyos

Make AVCodecTag.id enum CodecID and use CODEC_ID_NONE instead of 0.

Originally committed as revision 20250 to svn://svn.ffmpeg.org/ffmpeg/trunk
0b389aee 06/17/2009 12:37 AM Alexander Strange

Add '.mp1' for MP1 audio in MOV/CAF.
Tested with streamcopy of 'mp1-sample.mp1' in incoming.

Originally committed as revision 19212 to svn://svn.ffmpeg.org/ffmpeg/trunk
b46f18e5 06/16/2009 11:50 PM Jason Garrett-Glaser

Add ".mp2" as a fourcc for mp2 audio in MOV. Fixes a problematic MOV file.

Originally committed as revision 19211 to svn://svn.ffmpeg.org/ffmpeg/trunk
67fe5089 06/13/2009 03:02 AM Jason Garrett-Glaser

Analysis of logs show that there are in fact some files with m1v1 too (not just m2v2),
which is documented to be MPEG-1 video. Adding fourcc to isom.c.

Originally committed as revision 19180 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
761cb871 06/13/2009 12:16 AM Jason Garrett-Glaser

Add "0x11005354" as a fourcc for MOV audio; fixes audio detection in a problematic MOV file.
The audio is actually adpcm_ima_wav.

Originally committed as revision 19176 to svn://svn.ffmpeg.org/ffmpeg/trunk
94d3d6a4 06/12/2009 05:29 AM Jimmy Christensen

DPX (Digital Picture Exchange) image decoder
patch by Jimmy Christensen, jimmy ghost dk

Originally committed as revision 19163 to svn://svn.ffmpeg.org/ffmpeg/trunk
34edd994 06/12/2009 05:26 AM David Conrad

Add sac3 to mp4 fourccs for mov+h264+aac-sac3+mp4s+ETERNAL_cut.mp4

Originally committed as revision 19162 to svn://svn.ffmpeg.org/ffmpeg/trunk
14ed2d99 06/12/2009 02:20 AM Jason Garrett-Glaser

Add "m2v1" to fourccs for MPEG-2 video; fixes some MOV files.

Originally committed as revision 19161 to svn://svn.ffmpeg.org/ffmpeg/trunk
be43ae66 06/12/2009 01:09 AM Jason Garrett-Glaser

Add alternate fourcc for QCELP audio (qclq). Fixes a problematic MOV file.

Originally committed as revision 19159 to svn://svn.ffmpeg.org/ffmpeg/trunk
e131922e 05/12/2009 08:00 PM Baptiste Coudurier

v210 mov fourcc

Originally committed as revision 18803 to svn://svn.ffmpeg.org/ffmpeg/trunk
c239a65b 05/05/2009 04:27 AM Baptiste Coudurier

more dvcprohd .mov fourcc, see #1034

Originally committed as revision 18738 to svn://svn.ffmpeg.org/ffmpeg/trunk
3dd2f87e 04/02/2009 12:15 PM Jai Menon

Map MOV fourcc YUV2 correctly to PIX_FMT_YUYV422.

Patch by Jai Menon

Originally committed as revision 18316 to svn://svn.ffmpeg.org/ffmpeg/trunk
2904fd39 02/26/2009 01:11 PM Aurelien Jacobs

return -1 for errors in ff_mov_iso639_to_lang() to allow for error checking

Originally committed as revision 17611 to svn://svn.ffmpeg.org/ffmpeg/trunk
dce25564 01/21/2009 10:32 PM Aurelien Jacobs

'code' is used to index a table so make it unsigned
this prevents using negative index and possibly crashing with broken files

Originally committed as revision 16714 to svn://svn.ffmpeg.org/ffmpeg/trunk
406792e7 01/19/2009 03:46 PM Diego Biurrun

cosmetics: Remove pointless period after copyright statement non-sentences.

Originally committed as revision 16684 to svn://svn.ffmpeg.org/ffmpeg/trunk
f6204886 01/11/2009 10:26 AM David Conrad

Add support for muxing mov/mp4/3gp timed text streams

Originally committed as revision 16531 to svn://svn.ffmpeg.org/ffmpeg/trunk
18cb36fd 12/17/2008 08:09 AM Baptiste Coudurier

activate jpeg2000 fourcc in mov/mj2

Originally committed as revision 16185 to svn://svn.ffmpeg.org/ffmpeg/trunk
4d35964d 12/04/2008 03:00 AM Baptiste Coudurier

WRAW fourcc

Originally committed as revision 16001 to svn://svn.ffmpeg.org/ffmpeg/trunk
37d3e066 10/21/2008 09:40 PM Aurelien Jacobs

uses FF_ARRAY_ELEMS() where appropriate

Originally committed as revision 15662 to svn://svn.ffmpeg.org/ffmpeg/trunk
9b5ede5b 10/02/2008 03:52 PM Reimar Döffinger

Add (additional) const to many global tables.

Originally committed as revision 15515 to svn://svn.ffmpeg.org/ffmpeg/trunk
c4e02d70 09/03/2008 07:42 PM Baptiste Coudurier

change the logic to mux 13818-3 and 11172-3 in mp4, less code

Originally committed as revision 15190 to svn://svn.ffmpeg.org/ffmpeg/trunk
c3b13251 09/03/2008 07:23 PM Baptiste Coudurier

dirac muxing support in mp4/mov

Originally committed as revision 15188 to svn://svn.ffmpeg.org/ffmpeg/trunk
5180b027 09/03/2008 07:18 PM Baptiste Coudurier

cosmetics, move up mpeg1video mp4 objecttype

Originally committed as revision 15187 to svn://svn.ffmpeg.org/ffmpeg/trunk
2f980d2a 09/03/2008 07:17 PM Baptiste Coudurier

cosmetics, change values to hex since mp4ra use hex

Originally committed as revision 15186 to svn://svn.ffmpeg.org/ffmpeg/trunk
d4a240cb 09/03/2008 07:05 PM Baptiste Coudurier

ac3 muxing support in mov/mp4/m4v

Originally committed as revision 15184 to svn://svn.ffmpeg.org/ffmpeg/trunk
bea6c1ec 09/03/2008 01:42 AM Baptiste Coudurier

fix fourcc comment

Originally committed as revision 15169 to svn://svn.ffmpeg.org/ffmpeg/trunk
428626d5 09/02/2008 07:13 PM Baptiste Coudurier

allow mp2 to be muxed into mp4

Originally committed as revision 15155 to svn://svn.ffmpeg.org/ffmpeg/trunk
f8007a14 08/28/2008 10:41 PM Roman Shaposhnik

Intial implementation of the DV100 (AKA DVCPRO HD) decoder and demuxer as
specified in SMPTE 370M

Originally committed as revision 15010 to svn://svn.ffmpeg.org/ffmpeg/trunk
a1ef2c4b 08/19/2008 11:00 AM Peter Ross

Make MOV demuxer handle F32BE, F32LE, F64BE and F64LE PCM audio.

Originally committed as revision 14836 to svn://svn.ffmpeg.org/ffmpeg/trunk
f07fd8c0 07/30/2008 01:55 AM Baptiste Coudurier

add a bunch of new xdcam hd422 fourccs

Originally committed as revision 14473 to svn://svn.ffmpeg.org/ffmpeg/trunk
7fc628ca 07/30/2008 01:41 AM Baptiste Coudurier

more hdv fourccs

Originally committed as revision 14472 to svn://svn.ffmpeg.org/ffmpeg/trunk
138ef0a9 07/30/2008 01:39 AM Baptiste Coudurier

update hdv fourcc descriptions

Originally committed as revision 14471 to svn://svn.ffmpeg.org/ffmpeg/trunk
d4fdba0d 06/22/2008 11:52 PM Baptiste Coudurier

chinese avs demuxing support, demux AVSFileFormat.mp4

Originally committed as revision 13899 to svn://svn.ffmpeg.org/ffmpeg/trunk
76f34857 04/24/2008 05:16 PM Baptiste Coudurier

qcelp fourcc

Originally committed as revision 12940 to svn://svn.ffmpeg.org/ffmpeg/trunk
0c739854 04/15/2008 11:50 AM Michael Niedermayer

Identify codec in GMCMidiaASX.mov correctly.

Originally committed as revision 12832 to svn://svn.ffmpeg.org/ffmpeg/trunk
5610f20e 03/28/2008 04:30 PM Baptiste Coudurier

gsm in mov, demux surge-1-16-B-agsm.mov

Originally committed as revision 12621 to svn://svn.ffmpeg.org/ffmpeg/trunk
084d8faa 03/21/2008 01:47 PM Baptiste Coudurier

yet again another hdv fourcc

Originally committed as revision 12544 to svn://svn.ffmpeg.org/ffmpeg/trunk
19d02551 03/21/2008 11:02 AM Baptiste Coudurier

remove ms audio tags from table, they will be chosen or detected with riff table

Originally committed as revision 12533 to svn://svn.ffmpeg.org/ffmpeg/trunk
d0cbff86 02/11/2008 03:20 PM Baptiste Coudurier

fcp imx 40 fourccs

Originally committed as revision 11906 to svn://svn.ffmpeg.org/ffmpeg/trunk
eb3ba13b 01/29/2008 10:37 PM Reimar Döffinger

Support MP4 subtitles as in
http://samples.mplayerhq.hu/MPEG-4/embedded_subs/1Video_2Audio_2SUBs_timed_text_streams_.mp4

Originally committed as revision 11663 to svn://svn.ffmpeg.org/ffmpeg/trunk
efc9e44d 01/28/2008 01:19 PM Baptiste Coudurier

reorder object types id by muxing preference

Originally committed as revision 11648 to svn://svn.ffmpeg.org/ffmpeg/trunk
cc8c2c6a 01/27/2008 07:57 PM Reimar Döffinger

Add CODEC_ID_MOV_TEXT and use it instead of modifying the stream in the mov demuxer.

Originally committed as revision 11638 to svn://svn.ffmpeg.org/ffmpeg/trunk
e73e3a92 01/26/2008 10:55 PM Michael Niedermayer

Add non standard id needed for dvd subtitles.

Originally committed as revision 11626 to svn://svn.ffmpeg.org/ffmpeg/trunk
1e3c9307 01/26/2008 08:30 PM Michael Niedermayer

Set correct codec type and id for text subtitles.
fixes http://samples.mplayerhq.hu/mov/subtitles-embedded/subtitlemovie.mov
closes issue341

Originally committed as revision 11624 to svn://svn.ffmpeg.org/ffmpeg/trunk
067db6a5 01/26/2008 02:24 AM Baptiste Coudurier

comment vorbis objectype id

Originally committed as revision 11612 to svn://svn.ffmpeg.org/ffmpeg/trunk
4f8dc3b7 01/26/2008 02:22 AM Baptiste Coudurier

this one is not standardized either

Originally committed as revision 11611 to svn://svn.ffmpeg.org/ffmpeg/trunk
c63d3668 01/26/2008 01:35 AM Baptiste Coudurier

remove non standard object type ids, if you find samples, report them

Originally committed as revision 11610 to svn://svn.ffmpeg.org/ffmpeg/trunk
bffcf2eb 07/30/2007 10:00 AM Baptiste Coudurier

treat NONE as U8 to fix qtNONE/000_0032.MOV, this should not any have side effect since if bps is 16 in stsd, codec will be changed to s16be, just yell if this breaks any sample

Originally committed as revision 9832 to svn://svn.ffmpeg.org/ffmpeg/trunk
c3ebc833 05/10/2007 11:42 PM Baptiste Coudurier

dmb1 fourcc, mjpeg_opendml.mov

Originally committed as revision 8990 to svn://svn.ffmpeg.org/ffmpeg/trunk
8d27c5f8 04/25/2007 03:58 PM Baptiste Coudurier

add xdv2 xdcam hd tag, decode xdcam_hd_1080i60.mov

Originally committed as revision 8812 to svn://svn.ffmpeg.org/ffmpeg/trunk
2d99eed1 04/06/2007 06:29 PM Xiaohui Sun

SGI image decoder ported to the new image API.
patch by Xiaohui Sun, sunxiaohui dsp.ac cn

Originally committed as revision 8635 to svn://svn.ffmpeg.org/ffmpeg/trunk
2f124d2a 03/28/2007 03:45 PM Baptiste Coudurier

add hdv1 fourcc

Originally committed as revision 8540 to svn://svn.ffmpeg.org/ffmpeg/trunk
0174f514 03/25/2007 03:12 PM Baptiste Coudurier

prefer MP3 id

Originally committed as revision 8515 to svn://svn.ffmpeg.org/ffmpeg/trunk
db6d109d 03/25/2007 03:09 PM Baptiste Coudurier

use MKTAG

Originally committed as revision 8513 to svn://svn.ffmpeg.org/ffmpeg/trunk
ccba88d7 03/24/2007 03:24 PM Baptiste Coudurier

cosmectics, mov -> mp4

Originally committed as revision 8497 to svn://svn.ffmpeg.org/ffmpeg/trunk
295b7dc3 03/24/2007 03:17 PM Baptiste Coudurier

sort

Originally committed as revision 8496 to svn://svn.ffmpeg.org/ffmpeg/trunk
2b4162f0 03/24/2007 03:16 PM Baptiste Coudurier

add some codec object type ids

Originally committed as revision 8495 to svn://svn.ffmpeg.org/ffmpeg/trunk
b41899c6 03/24/2007 03:11 PM Baptiste Coudurier

prefer MP3 id as mentioned in avcodec.h line 210

Originally committed as revision 8494 to svn://svn.ffmpeg.org/ffmpeg/trunk
7555d2e6 03/24/2007 03:10 PM Baptiste Coudurier

add specifications reference comments

Originally committed as revision 8493 to svn://svn.ffmpeg.org/ffmpeg/trunk
c06136e0 03/18/2007 11:29 PM Baptiste Coudurier

add dnxhd fourcc

Originally committed as revision 8446 to svn://svn.ffmpeg.org/ffmpeg/trunk
3679f659 03/12/2007 05:43 PM Baptiste Coudurier

remove wrong avid imx ntsc fourcc

Originally committed as revision 8350 to svn://svn.ffmpeg.org/ffmpeg/trunk
36264d35 03/04/2007 01:58 AM Baptiste Coudurier

add pcm s8 tag

Originally committed as revision 8214 to svn://svn.ffmpeg.org/ffmpeg/trunk
1e5f5e3b 03/03/2007 02:55 PM Baptiste Coudurier

use common tables for mov muxer and demuxer

Originally committed as revision 8205 to svn://svn.ffmpeg.org/ffmpeg/trunk
7caf0cc6 01/21/2007 01:39 AM Michael Niedermayer

add codec_id <-> codec_tag tables to AVIn/OutputFormat

Originally committed as revision 7593 to svn://svn.ffmpeg.org/ffmpeg/trunk
b78e7197 10/07/2006 03:30 PM Diego Biurrun

Change license headers to say 'FFmpeg' instead of 'this program/this library'
and fix GPL/LGPL version mismatches.

Originally committed as revision 6577 to svn://svn.ffmpeg.org/ffmpeg/trunk
6c496518 08/20/2006 07:08 PM Benjamin Larsson

Added codec id for QCELP.

Originally committed as revision 6036 to svn://svn.ffmpeg.org/ffmpeg/trunk
e40ee6a2 08/01/2006 02:58 PM Baptiste Coudurier

move common code from mov.c and movenc.c to isom.c

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