highperfocused/ffmpeg
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
31,587 Commits 36 Branches 392 Tags
Commit Graph

110 Commits

Author SHA1 Message Date
Carl Eugen Hoyos
9442f50c33 Support 3IVD in isom, produced by 3ivx DivX Doctor. 
Fixes ticket #486.
(cherry picked from commit 4a9b069b6742f78ed7511d2a87af621ab1d43a59)
 2011-09-21 20:56:53 +02:00
Michael Niedermayer
095946afa7 Merge remote-tracking branch 'qatar/release/0.7' into release/0.8 
* qatar/release/0.7: (65 commits)
  riff: Add mpgv MPEG-2 fourcc
  Update Changelog
  matroskadec: fix integer underflow if header length < probe length.
  ffmpeg: fix operation with --disable-avfilter
  vf_libopencv: replace opencv/cxtypes.h #include by opencv/cxcore.h
  build: Create mlib optimization directories during out-of-tree builds.
  changelog: misc typo and wording fixes (cherry picked from commit b047941d7da470ba0dcedb1fd0aa828075265ffc)
  doc: Remove outdated comments about gcc 2.95 and gcc 3.3 support. (cherry picked from commit 5ccbf80963c1cc54aed97b1c81b1657ab91baf6a)
  matroskadec: matroska_read_seek after after EBML_STOP leads to failure.
  Update RELEASE file
  update Changelog
  mt: proper locking around release_buffer calls.
  vp8/mt: flush worker thread, not application thread context, on seek.
  docs: Mention the upstream bugzilla url about the dlltool vs MSVC issue
  docs: Use proper markup for a literal command line option
  docs: Don't recommend adding --enable-memalign-hack
  docs: Remove needless configure options
  oggdec: prevent heap corruption.
  oggdec: Abort Ogg header parsing when encountering a data packet.
  Add LGPL license boilerplate to files lacking it.
  ...

Conflicts:
	Changelog
	configure
	doc/developer.texi
	libavcodec/libvpxenc.c
	libavcodec/rawdec.c
	libavfilter/x86/gradfun.c
	libavformat/Makefile
	libavformat/isom.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2011-07-26 00:14:04 +02:00
Carl Eugen Hoyos
26f48752fb mov: Support Digital Voodoo SD 8 Bit and DTS codec identifiers. 
(cherry picked from commit 53d5cd2c8225e251826c77f8f69a30250038fbd0)

Signed-off-by: Reinhard Tartler <siretart@tauware.de>
 2011-06-23 08:50:37 +02:00
ami_stuff
1aef8de6d7 mov: Support R10g codec identifier. 
(cherry picked from commit 7ac639654f21aa78e0afa14f6c049ffa2c9078bd)

Signed-off-by: Reinhard Tartler <siretart@tauware.de>
 2011-06-23 08:50:37 +02:00
Carl Eugen Hoyos
369c68c4e1 Support DTS in mp4/mov. 2011-06-17 11:02:12 +02:00
Andrew Wason
4f4d1358ae Support reading chan atoms with empty channel descriptions. 
Fixes ticket 263.
 2011-06-15 11:09:17 +02:00
Carl Eugen Hoyos
6d721f714e Fix ff_mov_write_chan() so it can be used by other muxers. 2011-05-17 01:47:12 +02:00
Carl Eugen Hoyos
2c4ad1a37b Initial caf muxer. 2011-05-15 03:25:57 +02:00
Carl Eugen Hoyos
410ca3bc2d Support Digital Voodoo SD 8 Bit in mov (ticket 195). 2011-05-13 01:08:01 +02:00
ami_stuff
92ccdfb8bf Support R10g in mov. 2011-05-13 00:49:29 +02:00
Carl Eugen Hoyos
86f2c36c6c Add 5.1 plus stereo-downmix to mov_channel_layout array. 2011-05-13 00:23:30 +02:00
Carl Eugen Hoyos
dcf008af34 Clarify warning messages. 2011-04-28 10:47:00 +02:00
Carl Eugen Hoyos
91b782720f Move channel chunk reading function to isom.c. 
Move ff_read_chan_chunk() to isom.c and rename it as ff_mov_read_chan().
 2011-04-28 10:45:32 +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
Tomas Härdin
139313827c Add xd55 codec tag for XDCAM HD422 720p25 CBR files. 2011-03-21 12:08:05 +01: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