e11afd71a3
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>
(cherry picked from commit ed19fafd48
2011-02-09 03:30:01 +01:00
b9dab1131c
Add ProRes FOURCCs to isom.c
...
Signed-off-by: Mans Rullgard <mans@mansr.com>
(cherry picked from commit e65b1934bf
2011-02-04 03:10:11 +01:00
d25d1d06a4
Add AVC-Intra identifiers used by Flip4Mac for mov files
...
Signed-off-by: Mans Rullgard <mans@mansr.com>
(cherry picked from commit aa42cce57d
2011-02-04 03:10:10 +01:00
9ef5a9deaf
Replace dprintf with av_dlog
...
dprintf clashes with POSIX.1-2008
(cherry picked from commit dfd2a005eb
2011-01-30 03:41:48 +01:00
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
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
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
826481ea91
Remove duplicate entries
...
Originally committed as revision 25264 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-09-29 21:35:52 +00:00
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
e131922e48
v210 mov fourcc
...
Originally committed as revision 18803 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-05-12 20:00:11 +00:00
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
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
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
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
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
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
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
4d35964d01
WRAW fourcc
...
Originally committed as revision 16001 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-12-04 03:00:53 +00:00
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
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
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
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
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
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
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
bea6c1ec80
fix fourcc comment
...
Originally committed as revision 15169 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-09-03 01:42:26 +00:00
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
Sascha Sommer
Tomas Härdin
Benjamin Larsson
Luca Barbato
Baptiste Coudurier
Zhou Zongyi
Francesco Lavra
Reimar Döffinger
Carl Eugen Hoyos
Justin Ruggles
Andrew Wason
Alexander Strange
Jason Garrett-Glaser
David Conrad
Jimmy Christensen
Jai Menon
Aurelien Jacobs
Diego Biurrun