RepoMirrors
/
ffmpeg
mirror of https://git.ffmpeg.org/ffmpeg.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity
39,528 Commits 37 Branches 400 Tags 254 MiB
Commit Graph

39528 Commits

Author SHA1 Message Date
Paul B Mahol 02fb320ada libopenjpegdec: always check image because decoding may still fail 
Fixes bunch of segfaults.

Signed-off-by: Paul B Mahol <onemda@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-03-26 05:01:57 +02:00
Paul B Mahol 67d5fcc989 libopenjpegenc: allow changing encoding parameters 
Signed-off-by: Paul B Mahol <onemda@gmail.com>
Reviewed-by: Michael Bradshaw <mbradshaw@sorensonmedia.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-03-26 05:00:06 +02:00
Paul B Mahol dec8eb6b29 libopenjpegenc: merge common code 
Signed-off-by: Paul B Mahol <onemda@gmail.com>
Reviewed-by: Michael Bradshaw <mbradshaw@sorensonmedia.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-03-26 04:59:43 +02:00
Paul B Mahol 8e45005a84 libopenjpegenc: use pix_fmt descriptor to get bpp 
This will also simplify adding support for RGB565 and similar.

Signed-off-by: Paul B Mahol <onemda@gmail.com>
Reviewed-by: Michael Bradshaw <mbradshaw@sorensonmedia.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-03-26 04:59:18 +02:00
Paul B Mahol 06b0c6a655 libopenjpegenc: use pix_fmt descriptor to get numcomps 
Signed-off-by: Paul B Mahol <onemda@gmail.com>
Reviewed-by: Michael Bradshaw <mbradshaw@sorensonmedia.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-03-26 04:58:44 +02:00
Michael Niedermayer 140c54ea0b indeo4: better mv check 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-03-26 03:46:06 +02:00
Michael Niedermayer c855ece101 indeo5: check motion vectors. 
fixes out of frame reading

Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-03-26 03:45:45 +02:00
Michael Niedermayer 33f39c02aa mxfdec: pass correct context to av_timecode_init() 
fixes null ptr dereference
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-03-26 03:13:54 +02:00
Ronald S. Bultje b2af057a36 smacker: convert palette and header reading to bytestream2. 2012-03-25 16:31:16 -07:00
Paul B Mahol 40821980ae vf_hflip: accept PIX_FMT_RGB444 and PIX_FMT_BGR444 pixel formats 
Signed-off-by: Paul B Mahol <onemda@gmail.com>

added fate checksum update
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-03-26 01:02:18 +02:00
Paul B Mahol 25b67dc765 png: fix warning about discarding qualifiers [-Wincompatible-pointer-types] 
Signed-off-by: Paul B Mahol <onemda@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-03-26 01:02:11 +02:00
Aaron Colwell aa9c2e41b6 pthread : Remove lock/unlock pairs in worker loop to avoid unexpected state changes. 
Reviewed-by: Reimar Döffinger <Reimar.Doeffinger@gmx.de>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-03-26 00:09:50 +02:00
Michael Niedermayer 9621646eb3 Merge remote-tracking branch 'qatar/master' 
* qatar/master:
  x86: dsputil: prettyprint gcc inline asm
  x86: K&R prettyprinting cosmetics for dsputil_mmx.c
  x86: conditionally compile H.264 QPEL optimizations
  dsputil_mmx: Surround QPEL macros by "do { } while (0);" blocks.
  Ignore generated files below doc/.
  dpcm: convert to bytestream2.
  interplayvideo: convert to bytestream2.
  movenc: Merge if statements
  h264: fix memleak in error path.
  pthread: Immediately release all frames in ff_thread_flush()
  h264: Add check for invalid chroma_format_idc
  utvideo: port header reading to bytestream2.

Conflicts:
	.gitignore
	configure
	libavcodec/h264_ps.c
	libavcodec/interplayvideo.c
	libavcodec/pthread.c
	libavcodec/x86/dsputil_mmx.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2012-03-25 23:10:30 +02:00
Ronald S. Bultje c3bbd0b53b alac: convert extradata reading to bytestream2. 2012-03-25 13:35:05 -07:00
Michael Niedermayer 8d7f2db60a swr-test: test the new flexible buffering 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-03-25 21:50:49 +02:00
Michael Niedermayer 59b038b4a4 swr: realloc_audio: support packed audio buffers 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-03-25 21:50:00 +02:00
Michael Niedermayer 1b0fcf33b8 swr: More flexible and convenient buffering 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-03-25 21:49:42 +02:00
Julien Ramseier e479013ae4 Fix SVCD scan_offset option 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-03-25 19:29:31 +02:00
Paul B Mahol 680981832f "Metal Gear Solid: The Twin Snakes" demuxer 
Signed-off-by: Paul B Mahol <onemda@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-03-25 12:22:06 +02:00
Philip Langdale 1318b14379 CrystalHD: Remove EXPERIMENTAL flag for known good formats. 
With the flag in place, it's hard to actually use the decoder, and
I'm happy with how it works, with the exception of DivX3 where I've
never found a sample that worked that I was confident actually
matched what the hardware claimed to support.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-03-25 12:22:06 +02:00
Marton Balint 5420523ae3 pthread: return proper error code on pthread_create failure 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-03-25 12:22:06 +02:00
Michael Niedermayer e0c7128302 swr: fix segfault when 0 out size is used. 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-03-25 12:22:06 +02:00
Michael Niedermayer 691b92474a swr: revert stray hunk 
Found-by:ubitux
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-03-25 12:22:06 +02:00
Reimar Döffinger 6d797ac70f VC1: Do not needlessly use signed types. 
This might even have prevented the compiler from some optimizations,
since both signed and unsigned types are used for the dezigzag tables/
table pointers, and if a branches uses both the compiler needs to
create more complex code.

Signed-off-by: Reimar Döffinger <Reimar.Doeffinger@gmx.de>
 2012-03-25 12:24:15 +02:00
Reimar Döffinger 31ff2cb266 DV: detect another case of broken DV files. 
See trac issue #217.
Only the dsf field seems to be used to distinguish between PAL and NTSC.

Signed-off-by: Reimar Döffinger <Reimar.Doeffinger@gmx.de>
 2012-03-25 12:23:44 +02:00
Reimar Döffinger feda266db5 DV: check coded_width/height instead of width/height. 
This makes the workaround also work with lowres.
Fixes issue #633.

Signed-off-by: Reimar Döffinger <Reimar.Doeffinger@gmx.de>
 2012-03-25 12:23:44 +02:00
Reimar Döffinger 535eed9301 vqavideo: fix decoding of samples with no partial updates. 
Fixes playback of
http://samples.mplayerhq.hu/game-formats/vqa/landsoflore/B0EB8711.VQA
(trac issue #710).

Signed-off-by: Reimar Döffinger <Reimar.Doeffinger@gmx.de>
 2012-03-25 12:23:44 +02:00
Diego Biurrun 62ce9defb8 x86: dsputil: prettyprint gcc inline asm 2012-03-25 11:50:48 +02:00
Diego Biurrun 3b54912113 x86: K&R prettyprinting cosmetics for dsputil_mmx.c 2012-03-25 11:50:48 +02:00
Diego Biurrun 915a2a0a65 x86: conditionally compile H.264 QPEL optimizations 2012-03-25 11:50:45 +02:00
Diego Biurrun 3816642eab dsputil_mmx: Surround QPEL macros by "do { } while (0);" blocks. 
This makes them safe to use in non-fully braced if-blocks and similar.
 2012-03-25 11:48:37 +02:00
Diego Biurrun 5d115c1da7 Ignore generated files below doc/. 2012-03-25 11:46:15 +02:00
Michael Niedermayer 7e592379d9 resample: Fix boundary handling with fragments. 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-03-25 10:34:06 +02:00
Michael Niedermayer 8b11ae8a9a swr: Fix partial flushing. 
Found-by: durandal_1707
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-03-25 06:37:01 +02:00
Michael Niedermayer 19342bc725 swr: test partial flushing 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-03-25 05:58:21 +02:00
Michael Niedermayer 86e3289ffd mov: fix heap buffer overflow 
Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-03-25 04:25:24 +02:00
Ronald S. Bultje 3a3f06b05e dpcm: convert to bytestream2. 2012-03-24 19:02:26 -07:00
Michael Niedermayer 4f16153d35 swr: allow flushing in multiple steps if the output is too small. 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-03-25 03:33:06 +02:00
Michael Niedermayer 8bf95e8bd5 Merge remote-tracking branch 'qatar/master' 
* qatar/master:
  avc: Add a function for converting mp4 style extradata to annex b
  pthread: free progress if buffer allocation failed.
  lavc/avconv: support changing frame sizes in codecs with frame mt.
  libavformat: Document who sets the AVStream.id field
  utvideo: mark output picture as keyframe.
  sunrast: Add support for negative linesize.
  vp8: fix update_lf_deltas in libavcodec/vp8.c
  ralf: read Huffman code lengths without GetBitContext

Conflicts:
	ffmpeg.c
	libavcodec/sunrastenc.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2012-03-25 01:56:53 +01:00
Ronald S. Bultje f31a68e78c interplayvideo: convert to bytestream2. 2012-03-24 17:09:18 -07:00
Michael Niedermayer f4c380a5e6 ffmpeg: drop struct from SwrContext. 
Its a typdef now and doesnt need the struct anymore.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-03-25 01:00:07 +01:00
Michael Niedermayer ac6798dbc1 swr: fix compilation failure with old versions of gcc. 
gcc 4.4 did not like the way i used typedefs

Idea-by: beastd
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-03-25 00:35:10 +01:00
Martin Storsjö 68893afe1d movenc: Merge if statements 
This isn't exactly equivalent with the earlier code for codecs
other than H264 and VC1, but those are two only codecs supported
by this codepath anyway, and it simplifies it a bit.

Signed-off-by: Martin Storsjö <martin@martin.st>
 2012-03-25 01:06:49 +02:00
Paul B Mahol bcae7f432a libaacplus: switch to encode2() 
Signed-off-by: Paul B Mahol <onemda@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-03-24 23:35:09 +01:00
Alexander Strange cb34867780 h264: fix memleak in error path. 
Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
 2012-03-24 15:34:33 -07:00
Alexander Strange 147ee4cf06 pthread: Immediately release all frames in ff_thread_flush() 
Before this, they were only added to the delayed release queue and not
freed until later. This could lead to unnecessary memory use or buffer
exhaustion.

Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
 2012-03-24 15:29:51 -07:00
Alexander Strange 6ef4063957 h264: Add check for invalid chroma_format_idc 
Fixes a crash when FF_DEBUG_PICT_INFO is used.

Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
 2012-03-24 15:29:38 -07:00
Michael Niedermayer 15890d67c1 swr: drop SWR_CH_MAX with the next major ABI bump 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-03-24 23:20:46 +01:00
Ronald S. Bultje ec0ed97b04 utvideo: port header reading to bytestream2. 
Fixes crash during slice size reading if slice_end goes negative.

Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
CC: libav-stable@libav.org
 2012-03-24 15:15:56 -07:00
Michael Niedermayer 947215a261 swr: dont use SWR_CH_MAX in the public function declaration. 
This change should make no binary difference to the generated code.
the API version is just bumped for correctness sake, this is not
really a API or ABI change.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-03-24 23:03:17 +01:00