Alex Converse
77b5c82b49
isom: Add MPEG4SYSTEMS dummy object type indication.
2011-10-28 14:54:13 -07:00
Anton Khirnov
59a9a23581
lavc: use avpriv_ prefix for some mpeg4audio symbols used in lavf.
...
Specifically, ff_mpeg4audio_sample_rates, ff_mpeg4audio_get_config and
ff_copy_pce_data
2011-10-20 21:06:57 +02:00
Anton Khirnov
82ab61f901
lavc: use avpriv_ prefix for some mpegaudio symbols used in lavf.
...
Specifically, ff_mpa_freq_tab, ff_mpa_bitrate_tab, ff_mpa_decode_header,
ff_mpegaudio_decode_header.
2011-10-20 21:06:57 +02:00
Diego Biurrun
12bd8532cf
Synchronize various 4CCs and codec tags from FFmpeg.
2011-10-04 11:58:53 +02:00
Alex Converse
1c2e07b811
mp4: Don't read an empty Decoder Config Descriptor
2011-09-22 10:09:04 -07:00
Tomas Härdin
8b7222979c
isom: add missing AVC-Intra tags, rearrange list and update comments
...
Signed-off-by: Diego Biurrun <diego@biurrun.de>
2011-08-29 16:48:39 +02:00
Alex Converse
ad6c7c1b52
mp4: Handle non-trivial ES Descriptors.
2011-08-25 11:53:21 -07:00
Carl Eugen Hoyos
53d5cd2c82
mov: Support Digital Voodoo SD 8 Bit and DTS codec identifiers.
2011-06-21 21:39:00 +02:00
ami_stuff
7ac639654f
mov: Support R10g codec identifier.
2011-06-21 21:38:59 +02:00
Tomas Härdin
1b7ecc1662
Add xd55 codec tag for XDCAM HD422 720p25 CBR files.
...
Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
2011-03-23 07:30:15 -04:00
Mans Rullgard
2912e87a6c
Replace FFmpeg with Libav in licence headers
...
Signed-off-by: Mans Rullgard <mans@mansr.com>
2011-03-19 13:33:20 +00:00
Benjamin Larsson
35d7d6f748
Add one more avc intra fourcc and extend the description
...
Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
2011-03-10 20:32:32 -05:00
Benjamin Larsson
8f935b9271
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 <rsbultje@gmail.com>
2011-02-22 07:21:33 -05:00
Anton Khirnov
b7effd4e83
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
something useful.
Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
2011-02-21 11:23:22 -05:00
Anton Khirnov
ae628ec1fd
avio: rename ByteIOContext to AVIOContext.
...
Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
2011-02-20 08:37:15 -05:00
Sascha Sommer
ed19fafd48
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 <rsbultje@gmail.com>
2011-02-06 16:05:55 -05:00
Tomas Härdin
e65b1934bf
Add ProRes FOURCCs to isom.c
...
Signed-off-by: Mans Rullgard <mans@mansr.com>
2011-02-03 11:40:56 +00:00
Benjamin Larsson
aa42cce57d
Add AVC-Intra identifiers used by Flip4Mac for mov files
...
Signed-off-by: Mans Rullgard <mans@mansr.com>
2011-02-03 10:21:44 +00:00
Luca Barbato
dfd2a005eb
Replace dprintf with av_dlog
...
dprintf clashes with POSIX.1-2008
2011-01-29 23:55:37 +01:00
Baptiste Coudurier
798c6facb7
In ts demuxer, support aac flexmux using extradata in iods, issue #2346
...
Originally committed as revision 25806 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-11-23 00:51:12 +00:00
Baptiste Coudurier
c9b8762856
xdcam hd422 720p24 fourcc in mov
...
Originally committed as revision 25336 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-10-04 20:23:36 +00:00
Baptiste Coudurier
d8e456400e
Correct tag is m2v1
...
Originally committed as revision 25271 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-09-30 18:12:27 +00:00
Baptiste Coudurier
826481ea91
Remove duplicate entries
...
Originally committed as revision 25264 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-09-29 21:35:52 +00:00
Baptiste Coudurier
3432c26319
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
2010-09-29 21:34:31 +00:00
Zhou Zongyi
4383692896
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
2010-09-13 22:08:51 +00:00
Baptiste Coudurier
9a191b3a21
Support gray16be and rgb48be in mov
...
Originally committed as revision 23608 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-06-15 09:14:00 +00:00
Baptiste Coudurier
414ba8e35f
More mov rawvideo fourcc
...
Originally committed as revision 23480 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-06-04 23:31:46 +00:00
Francesco Lavra
80b39e1ca6
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
2010-05-22 16:01:32 +00:00
Reimar Döffinger
029ddf333c
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
2010-01-30 22:05:26 +00:00
Reimar Döffinger
1c90d2985d
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
2010-01-30 21:54:06 +00:00
Reimar Döffinger
832ec42858
Simplify conversion to 5-bit ASCII.
...
Originally committed as revision 21557 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-01-30 21:50:47 +00:00
Carl Eugen Hoyos
59ea69ef54
Support decoding of Avid uncompressed mov files, fixes issue 1685.
...
Originally committed as revision 21223 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-01-15 11:03:40 +00:00
Carl Eugen Hoyos
a0ae3e41f3
Support decoding Avid 1:1x codec, (partially) fixes issue1684.
...
Originally committed as revision 21222 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-01-15 10:55:31 +00:00
Reimar Döffinger
4aaab0a328
Add decoder for R210 (uncompressed 10-bit RGB) codec.
...
Originally committed as revision 20891 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-12-17 18:56:56 +00:00
Baptiste Coudurier
7c4b7d0f41
support pcm_f32/64le in mov
...
Originally committed as revision 20649 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-11-29 02:27:08 +00:00
Justin Ruggles
c3988a59ce
Add MP4 object type for ALS.
...
Originally committed as revision 20578 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-11-22 18:13:22 +00:00
Andrew Wason
42022e0362
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
2009-11-03 16:17:21 +00:00
Carl Eugen Hoyos
bc2d2a07d5
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
2009-10-16 14:46:06 +00:00
Alexander Strange
0b389aee4d
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
2009-06-17 00:37:06 +00:00
Jason Garrett-Glaser
b46f18e5d2
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
2009-06-16 23:50:02 +00:00
Jason Garrett-Glaser
67fe508916
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
2009-06-13 03:02:16 +00:00
David Conrad
86b61d4241
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
2009-06-13 00:50:57 +00:00
Jason Garrett-Glaser
761cb87173
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
2009-06-13 00:16:39 +00:00
Jimmy Christensen
94d3d6a468
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
2009-06-12 05:29:29 +00:00
David Conrad
34edd9948d
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
2009-06-12 05:26:40 +00:00
Jason Garrett-Glaser
14ed2d9983
Add "m2v1" to fourccs for MPEG-2 video; fixes some MOV files.
...
Originally committed as revision 19161 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-06-12 02:20:26 +00:00
Jason Garrett-Glaser
be43ae6651
Add alternate fourcc for QCELP audio (qclq). Fixes a problematic MOV file.
...
Originally committed as revision 19159 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-06-12 01:09:49 +00:00
Baptiste Coudurier
e131922e48
v210 mov fourcc
...
Originally committed as revision 18803 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-05-12 20:00:11 +00:00
Baptiste Coudurier
c239a65b70
more dvcprohd .mov fourcc, see #1034
...
Originally committed as revision 18738 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-05-05 04:27:24 +00:00
Jai Menon
3dd2f87e61
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
2009-04-02 12:15:04 +00:00
Aurelien Jacobs
2904fd398f
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
2009-02-26 13:11:18 +00:00
Aurelien Jacobs
dce25564cc
'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
2009-01-21 22:32:17 +00:00
Diego Biurrun
406792e7b0
cosmetics: Remove pointless period after copyright statement non-sentences.
...
Originally committed as revision 16684 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-01-19 15:46:40 +00:00
David Conrad
f620488654
Add support for muxing mov/mp4/3gp timed text streams
...
Originally committed as revision 16531 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-01-11 10:26:44 +00:00
Baptiste Coudurier
18cb36fd57
activate jpeg2000 fourcc in mov/mj2
...
Originally committed as revision 16185 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-12-17 08:09:09 +00:00
Baptiste Coudurier
4d35964d01
WRAW fourcc
...
Originally committed as revision 16001 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-12-04 03:00:53 +00:00
Aurelien Jacobs
37d3e0667a
uses FF_ARRAY_ELEMS() where appropriate
...
Originally committed as revision 15662 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-10-21 21:40:24 +00:00
Reimar Döffinger
9b5ede5b64
Add (additional) const to many global tables.
...
Originally committed as revision 15515 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-10-02 15:52:04 +00:00
Baptiste Coudurier
c4e02d702c
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
2008-09-03 19:42:09 +00:00
Baptiste Coudurier
c3b1325158
dirac muxing support in mp4/mov
...
Originally committed as revision 15188 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-09-03 19:23:24 +00:00
Baptiste Coudurier
5180b027cc
cosmetics, move up mpeg1video mp4 objecttype
...
Originally committed as revision 15187 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-09-03 19:18:49 +00:00
Baptiste Coudurier
2f980d2a83
cosmetics, change values to hex since mp4ra use hex
...
Originally committed as revision 15186 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-09-03 19:17:28 +00:00
Baptiste Coudurier
d4a240cbc9
ac3 muxing support in mov/mp4/m4v
...
Originally committed as revision 15184 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-09-03 19:05:22 +00:00
Baptiste Coudurier
bea6c1ec80
fix fourcc comment
...
Originally committed as revision 15169 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-09-03 01:42:26 +00:00
Baptiste Coudurier
428626d5d1
allow mp2 to be muxed into mp4
...
Originally committed as revision 15155 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-09-02 19:13:25 +00:00
Roman Shaposhnik
f8007a1473
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
2008-08-28 22:41:00 +00:00
Peter Ross
a1ef2c4bb3
Make MOV demuxer handle F32BE, F32LE, F64BE and F64LE PCM audio.
...
Originally committed as revision 14836 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-08-19 11:00:40 +00:00
Baptiste Coudurier
f07fd8c08c
add a bunch of new xdcam hd422 fourccs
...
Originally committed as revision 14473 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-07-30 01:55:59 +00:00
Baptiste Coudurier
7fc628cad9
more hdv fourccs
...
Originally committed as revision 14472 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-07-30 01:41:12 +00:00
Baptiste Coudurier
138ef0a9a2
update hdv fourcc descriptions
...
Originally committed as revision 14471 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-07-30 01:39:20 +00:00
Baptiste Coudurier
d4fdba0df7
chinese avs demuxing support, demux AVSFileFormat.mp4
...
Originally committed as revision 13899 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-06-22 23:52:57 +00:00
Baptiste Coudurier
76f34857ce
qcelp fourcc
...
Originally committed as revision 12940 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-04-24 17:16:13 +00:00
Michael Niedermayer
0c73985444
Identify codec in GMCMidiaASX.mov correctly.
...
Originally committed as revision 12832 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-04-15 11:50:37 +00:00
Baptiste Coudurier
5610f20ed4
gsm in mov, demux surge-1-16-B-agsm.mov
...
Originally committed as revision 12621 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-03-28 16:30:22 +00:00
Baptiste Coudurier
084d8faa21
yet again another hdv fourcc
...
Originally committed as revision 12544 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-03-21 13:47:20 +00:00
Baptiste Coudurier
19d02551d7
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
2008-03-21 11:02:13 +00:00
Baptiste Coudurier
d0cbff868e
fcp imx 40 fourccs
...
Originally committed as revision 11906 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-02-11 15:20:35 +00:00
Reimar Döffinger
eb3ba13b51
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
2008-01-29 22:37:07 +00:00
Baptiste Coudurier
efc9e44da6
reorder object types id by muxing preference
...
Originally committed as revision 11648 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-01-28 13:19:49 +00:00
Reimar Döffinger
cc8c2c6ab3
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
2008-01-27 19:57:04 +00:00
Michael Niedermayer
e73e3a926d
Add non standard id needed for dvd subtitles.
...
Originally committed as revision 11626 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-01-26 22:55:34 +00:00
Michael Niedermayer
1e3c9307e6
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
2008-01-26 20:30:03 +00:00
Baptiste Coudurier
067db6a58a
comment vorbis objectype id
...
Originally committed as revision 11612 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-01-26 02:24:35 +00:00
Baptiste Coudurier
4f8dc3b7f1
this one is not standardized either
...
Originally committed as revision 11611 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-01-26 02:22:45 +00:00
Baptiste Coudurier
c63d3668fc
remove non standard object type ids, if you find samples, report them
...
Originally committed as revision 11610 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-01-26 01:35:51 +00:00
Baptiste Coudurier
bffcf2ebbf
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
2007-07-30 10:00:42 +00:00
Baptiste Coudurier
c3ebc833b9
dmb1 fourcc, mjpeg_opendml.mov
...
Originally committed as revision 8990 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-05-10 23:42:28 +00:00
Baptiste Coudurier
8d27c5f891
add xdv2 xdcam hd tag, decode xdcam_hd_1080i60.mov
...
Originally committed as revision 8812 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-04-25 15:58:05 +00:00
Xiaohui Sun
2d99eed135
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
2007-04-06 18:29:27 +00:00
Baptiste Coudurier
2f124d2af2
add hdv1 fourcc
...
Originally committed as revision 8540 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-03-28 15:45:24 +00:00
Baptiste Coudurier
0174f51470
prefer MP3 id
...
Originally committed as revision 8515 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-03-25 15:12:27 +00:00
Baptiste Coudurier
db6d109da2
use MKTAG
...
Originally committed as revision 8513 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-03-25 15:09:02 +00:00
Baptiste Coudurier
ccba88d764
cosmectics, mov -> mp4
...
Originally committed as revision 8497 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-03-24 15:24:36 +00:00
Baptiste Coudurier
295b7dc367
sort
...
Originally committed as revision 8496 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-03-24 15:17:30 +00:00
Baptiste Coudurier
2b4162f0ae
add some codec object type ids
...
Originally committed as revision 8495 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-03-24 15:16:03 +00:00
Baptiste Coudurier
b41899c66c
prefer MP3 id as mentioned in avcodec.h line 210
...
Originally committed as revision 8494 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-03-24 15:11:47 +00:00
Baptiste Coudurier
7555d2e633
add specifications reference comments
...
Originally committed as revision 8493 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-03-24 15:10:12 +00:00
Baptiste Coudurier
c06136e024
add dnxhd fourcc
...
Originally committed as revision 8446 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-03-18 23:29:40 +00:00
Baptiste Coudurier
3679f65946
remove wrong avid imx ntsc fourcc
...
Originally committed as revision 8350 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-03-12 17:43:36 +00:00
Baptiste Coudurier
36264d3586
add pcm s8 tag
...
Originally committed as revision 8214 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-03-04 01:58:10 +00:00