generic-library/ffmpeg
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity
49,872 Commits 24 Branches 241 Tags
Commit Graph

22719 Commits

Author SHA1 Message Date
Michael Niedermayer
0a5138695a Merge commit '182821cff43f5f977004d105b86c47ceb20d00d6' 
* commit '182821cff43f5f977004d105b86c47ceb20d00d6':
  dca: decode directly to the user-provided AVFrame
  cook: decode directly to the user-provided AVFrame
  comfortnoise: decode directly to the user-provided AVFrame
  bmvaudio: decode directly to the user-provided AVFrame
  pcm: decode directly to the user-provided AVFrame

Conflicts:
	libavcodec/pcm.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2013-02-13 11:53:23 +01:00
Michael Niedermayer
f03cdbd045 Merge commit '5cc0bd2cb47cbb1040f2bb0ded8d72a442c79b20' 
* commit '5cc0bd2cb47cbb1040f2bb0ded8d72a442c79b20':
  binkaudio: decode directly to the user-provided AVFrame
  atrac3: decode directly to the user-provided AVFrame
  atrac1: decode directly to the user-provided AVFrame
  ape: decode directly to the user-provided AVFrame
  amrwb: decode directly to the user-provided AVFrame

Conflicts:
	libavcodec/amrwbdec.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2013-02-13 11:45:25 +01:00
Michael Niedermayer
d13f434dbb Merge commit 'e3db34291f4401a16f6ac92721617a9f33cd4c31' 
* commit 'e3db34291f4401a16f6ac92721617a9f33cd4c31':
  amrnb: decode directly to the user-provided AVFrame
  als: decode directly to the user-provided AVFrame
  alac: decode directly to the user-provided AVFrame
  adxenc: alloc/free coded_frame instead of keeping it in the ADXContext
  adx: decode directly to the user-provided AVFrame

Conflicts:
	libavcodec/alsdec.c
	libavcodec/amrnbdec.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2013-02-13 11:39:05 +01:00
Michael Niedermayer
4789955ec4 Merge commit 'e57daa876bf0cf50782550e366e589441cd8c2bd' 
* commit 'e57daa876bf0cf50782550e366e589441cd8c2bd':
  adpcm: decode directly to the user-provided AVFrame
  ac3: decode directly to the user-provided AVFrame
  aac: decode directly to the user-provided AVFrame
  8svx: decode directly to the user-provided AVFrame

Conflicts:
	libavcodec/8svx.c
	libavcodec/ac3dec.c
	libavcodec/adpcm.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2013-02-13 11:27:54 +01:00
Michael Niedermayer
4f1279154e shorten: dont leave invalid channel counts in the context. 
Fixes freeing invalid addresses

Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-02-13 01:04:20 +01:00
Michael Niedermayer
e1219cdaf9 tiff: Check buffer allocation and pointer increment more carefully in shorts2str() and double2str() 
Fixes out of array accesses

Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-02-12 23:49:41 +01:00
Michael Niedermayer
6f9ae391de faxcompr: Dont read ref when the end has been reached in pass mode 
Fixes reading over the end

Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-02-12 22:55:44 +01:00
Michael Niedermayer
1ac0fa50ef pngdec/filter: dont access out of array elements at the end 
Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-02-12 20:10:35 +01:00
Justin Ruggles
182821cff4 dca: decode directly to the user-provided AVFrame 2013-02-12 12:21:22 -05:00
Justin Ruggles
7b78321597 cook: decode directly to the user-provided AVFrame 2013-02-12 12:21:22 -05:00
Justin Ruggles
5cc0bd2cb4 binkaudio: decode directly to the user-provided AVFrame 2013-02-12 12:21:21 -05:00
Justin Ruggles
e3db34291f amrnb: decode directly to the user-provided AVFrame 2013-02-12 12:21:21 -05:00
Justin Ruggles
e57daa876b adpcm: decode directly to the user-provided AVFrame 2013-02-12 12:21:21 -05:00
Justin Ruggles
cddf8998f1 comfortnoise: decode directly to the user-provided AVFrame 2013-02-12 12:21:21 -05:00
Justin Ruggles
9a75ace2b2 atrac3: decode directly to the user-provided AVFrame 2013-02-12 12:21:21 -05:00
Justin Ruggles
9b0b355e97 als: decode directly to the user-provided AVFrame 2013-02-12 12:21:21 -05:00
Justin Ruggles
55d2e12aef ac3: decode directly to the user-provided AVFrame 2013-02-12 12:21:21 -05:00
Justin Ruggles
e42e5a89d6 bmvaudio: decode directly to the user-provided AVFrame 2013-02-12 12:21:21 -05:00
Justin Ruggles
0ded61b57a atrac1: decode directly to the user-provided AVFrame 2013-02-12 12:21:21 -05:00
Justin Ruggles
5cd597f22f alac: decode directly to the user-provided AVFrame 2013-02-12 12:21:21 -05:00
Justin Ruggles
ffd2123095 aac: decode directly to the user-provided AVFrame 2013-02-12 12:21:21 -05:00
Justin Ruggles
a6bb39add2 pcm: decode directly to the user-provided AVFrame 2013-02-12 12:21:21 -05:00
Justin Ruggles
5932e2d7d2 ape: decode directly to the user-provided AVFrame 2013-02-12 12:21:21 -05:00
Justin Ruggles
bae4f47938 adxenc: alloc/free coded_frame instead of keeping it in the ADXContext 2013-02-12 12:21:21 -05:00
Justin Ruggles
a3de4010c2 8svx: decode directly to the user-provided AVFrame 2013-02-12 12:21:21 -05:00
Justin Ruggles
da28bb3f4a amrwb: decode directly to the user-provided AVFrame 2013-02-12 12:21:21 -05:00
Justin Ruggles
0588935e64 adx: decode directly to the user-provided AVFrame 2013-02-12 12:21:21 -05:00
James Almer
0957041221 lavc/tta: Add support for encrypted streams 
Signed-off-by: James Almer <jamrial@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-02-12 15:36:12 +01:00
Michael Niedermayer
7491356111 Merge commit '304b806cb524fb040f8e09a241040f1af2cb820b' 
* commit '304b806cb524fb040f8e09a241040f1af2cb820b':
  build: Make library minor version visible in the Makefile
  x86: mpeg4qpel: Make movsxifnidn do the right thing

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2013-02-12 13:26:22 +01:00
Michael Niedermayer
fe54f6cb45 Merge commit '4c51fe48ba6dde059360b7451db7f6bbf2f11db3' 
* commit '4c51fe48ba6dde059360b7451db7f6bbf2f11db3':
  h264: Copy h264chroma dsp context to slice thread copies
  swscale: Disallow conversion to GBRP16

Conflicts:
	libswscale/utils.c
	tests/ref/lavfi/pixdesc
	tests/ref/lavfi/pixfmts_copy
	tests/ref/lavfi/pixfmts_null
	tests/ref/lavfi/pixfmts_scale
	tests/ref/lavfi/pixfmts_vflip

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2013-02-12 13:18:28 +01:00
Ronald S. Bultje
7ff1a4b10f Add add_pixels4/8() to h264dsp, and remove add_pixels4 from dsputil. 
These functions are mostly H264-specific (the only other user I can
spot is bink), and this allows us to special-case some functionality
for H264. Also remove the 16-bit-coeff with >8bpp versions (unused)
and merge the duplicate 32-bit-coeff for >8bpp (identical).

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-02-12 02:14:16 +01:00
Michael Niedermayer
5260edee7e sanm: Use the correct height variable in the decoded_size checks 
Fixes integer overflow and out of array accesses

Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-02-12 02:04:24 +01:00
Michael Niedermayer
4ee88db840 sanm: init sizes with the full frame size 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-02-12 02:00:33 +01:00
Michael Niedermayer
f0d9ccac89 sanm: reset frame sizes on buffer destruction 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-02-12 01:59:07 +01:00
Michael Niedermayer
365270aec5 sanm: add forgotten check for decoded_size in old_codec37() 
Fixes out of array accesses

Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-02-12 01:15:57 +01:00
Ronald S. Bultje
972771dcf2 h264chroma: remove duplicate 9/10 bit functions. 
Also use the resulting 16bpp functions for anything >8 and <=16, not just
9 and 10. This fixes 12 and 14bpp H264 support.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-02-11 22:54:52 +01:00
Daniel Kang
b3f2a3fe3f x86: mpeg4qpel: Make movsxifnidn do the right thing 
Fixes an instruction that does nothing by changing the
source to dword.

Signed-off-by: Diego Biurrun <diego@biurrun.de>
 2013-02-11 20:17:15 +01:00
Martin Storsjö
4c51fe48ba h264: Copy h264chroma dsp context to slice thread copies 
This fixes slice threading which seems to have been broken since
79dad2a93.

Signed-off-by: Martin Storsjö <martin@martin.st>
 2013-02-11 21:12:21 +02:00
Michael Niedermayer
0aa1d848ec ffv1enc: better heuristic to calculate initial states 
Slightly improves compression of 2pass files

Tested-by: "Peter B." <pb@das-werkstatt.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-02-11 19:25:41 +01:00
Diego Biurrun
6fb296e97e avcodec/rectangle: Remove nonsense assert 2013-02-11 16:23:09 +01:00
Derek Buitenhuis
c177f2ec4a libfdk-aacenc: Actually check for upper bounds of cutoff 
Signed-off-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
 2013-02-11 10:20:33 -05:00
Derek Buitenhuis
375ef6528c libfdk-aacenc: Actually check for upper bounds of cutoff 
Signed-off-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
 2013-02-11 10:15:42 -05:00
Michael Niedermayer
c3a62d3507 Merge remote-tracking branch 'qatar/master' 
* qatar/master:
  sparc: dsputil_vis: Fix silly variable name search and replace typo

Conflicts:
	libavcodec/sparc/dsputil_vis.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2013-02-11 12:15:54 +01:00
Paul B Mahol
5d7009dac2 evrcdec: fix wrong condition 
Fixes CID980005 and CID980004.

Signed-off-by: Paul B Mahol <onemda@gmail.com>
 2013-02-11 11:04:52 +00:00
Ronald S. Bultje
fd6a021d8e get_bits: return pointer to buffer that is the result of the alignment. 
This allows more transparent mixing of get_bits and whole-byte access
without having to touch get_bits internals.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-02-11 02:29:43 +01:00
Ronald S. Bultje
5e74a2b685 bit_depth_template: don't depend on dsputil.h. 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-02-11 01:03:45 +01:00
Ronald S. Bultje
c7e3e55429 Move ff_emulated_edge_mc prototypes to videodsp. 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-02-11 01:03:33 +01:00
Ronald S. Bultje
55e35c98d5 h264 intra pred: add missing includes. 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-02-11 01:03:12 +01:00
Michael Niedermayer
8491ac3ad2 mlpdec: check ch_assign more completely 
Fixes CID970924

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-02-11 00:50:29 +01:00
Diego Biurrun
d46d87d1d3 sparc: dsputil_vis: Fix silly variable name search and replace typo 2013-02-10 22:23:43 +01:00