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
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
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
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
7fc628cad9
more hdv fourccs
...
Originally committed as revision 14472 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-07-30 01:41:12 +00:00
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
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
76f34857ce
qcelp fourcc
...
Originally committed as revision 12940 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-04-24 17:16:13 +00:00
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
2f124d2af2
add hdv1 fourcc
...
Originally committed as revision 8540 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-03-28 15:45:24 +00:00
0174f51470
prefer MP3 id
...
Originally committed as revision 8515 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-03-25 15:12:27 +00:00
db6d109da2
use MKTAG
...
Originally committed as revision 8513 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-03-25 15:09:02 +00:00
ccba88d764
cosmectics, mov -> mp4
...
Originally committed as revision 8497 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-03-24 15:24:36 +00:00
295b7dc367
sort
...
Originally committed as revision 8496 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-03-24 15:17:30 +00:00
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
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
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
c06136e024
add dnxhd fourcc
...
Originally committed as revision 8446 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-03-18 23:29:40 +00:00
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
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
1e5f5e3b7a
use common tables for mov muxer and demuxer
...
Originally committed as revision 8205 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-03-03 14:55:11 +00:00
7caf0cc62c
add codec_id <-> codec_tag tables to AVIn/OutputFormat
...
Originally committed as revision 7593 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-01-21 01:39:17 +00:00
b78e7197a8
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
2006-10-07 15:30:46 +00:00
6c496518e8
Added codec id for QCELP.
...
Originally committed as revision 6036 to svn://svn.ffmpeg.org/ffmpeg/trunk
2006-08-20 19:08:05 +00:00
e40ee6a268
move common code from mov.c and movenc.c to isom.c
...
Originally committed as revision 5882 to svn://svn.ffmpeg.org/ffmpeg/trunk
2006-08-01 14:58:15 +00:00
Alexander Strange
Jason Garrett-Glaser
David Conrad
Jimmy Christensen
Baptiste Coudurier
Jai Menon
Aurelien Jacobs
Diego Biurrun
Reimar Döffinger
Roman Shaposhnik
Peter Ross
Michael Niedermayer
Xiaohui Sun
Benjamin Larsson