RepoMirrors
/
ffmpeg
mirror of https://git.ffmpeg.org/ffmpeg.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity
62,602 Commits 36 Branches 398 Tags 242 MiB
Commit Graph

28256 Commits

Author SHA1 Message Date
Michael Niedermayer 78fb5f6e2a avcodec/cngenc: Use av_malloc_array() 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-04-22 02:38:03 +02:00
Michael Niedermayer 0dadbbbfd1 avcodec/snow: use FF_ALLOC(Z)_ARRAY_OR_GOTO 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-04-22 02:12:02 +02:00
Michael Niedermayer 451c78740a Merge commit '93e15a323871613fd26f1f1e317029a50b5b24ca' 
* commit '93e15a323871613fd26f1f1e317029a50b5b24ca':
  fic: use correct IDCT

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2014-04-21 20:20:39 +02:00
Kostya Shishkov 93e15a3238 fic: use correct IDCT 
Signed-off-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
 2014-04-21 12:37:54 -04:00
Clément Bœsch 62d31307c1 avcodec/x86/vp9lpf: add a comment above a bunch of SWAP. 2014-04-20 21:33:58 +02:00
Clément Bœsch f0d368d758 avcodec/x86/vp9lpf: merge a few movs with other instructions. 2014-04-20 21:29:11 +02:00
Michael Niedermayer af89a685c4 avcodec/arm/vc1dsp_init_neon: fix code so it compiles and passes fate-vc1 
The original patch  seems to be missing a 16x16 function though

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-04-20 20:32:21 +02:00
Christophe Gisquet 319235c67c vc1dsp: introduce cases for 8x8 and 16x16 
This allows further unrolling the DSP implementation where possible.

x86 and ARM DSP modified by simply moving the multiple calls from vc1dec
to the DSP code. Decoding improvements should only occurs because of the
compiler actually able to unroll more.

Decoding time: ~8.80s -> 8.64s (ie around 2%)

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-04-20 18:25:36 +02:00
Michael Niedermayer de9cd58848 avcdoec/webp: use av_malloc_array() 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-04-20 17:35:19 +02:00
Michael Niedermayer 8c88ea76df avcodec/tiff: use av_malloc(z)_array() 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-04-20 17:32:17 +02:00
Michael Niedermayer 1fd5c7f1ee avcodec/ratecontrol: use av_malloc_array() 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-04-20 17:30:15 +02:00
Michael Niedermayer 69bbe27b45 avcodec/huffman: use av_malloc_array() 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-04-20 17:25:01 +02:00
Michael Niedermayer e70b9b32d5 avcodec/exif: do not follow 0 offsets 
Fixes exif decoding failure of 1295328_300.jpg

Reviewed-by; Thilo Borgmann <thilo.borgmann@mail.de>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-04-20 17:02:16 +02:00
Michael Niedermayer a94de50ba0 avcodec/exif/exif_add_metadata: add support for SSHORT & SBYTE 
No working testcase, this omission was just spoted when the parser apparently went out of
sync.

Reviewed-by; Thilo Borgmann <thilo.borgmann@mail.de>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-04-20 17:01:46 +02:00
Michael Niedermayer 373d7dd371 Merge commit '911fa05b514e1be009e00b79d7004b93717c023b' 
* commit '911fa05b514e1be009e00b79d7004b93717c023b':
  mvc: Specify the pixel format for the mv-mvc* tests

Conflicts:
	tests/fate/video.mak

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2014-04-19 22:43:16 +02:00
Martin Storsjö 911fa05b51 mvc: Specify the pixel format for the mv-mvc* tests 
Also set the RGBA pixel format correctly as the native endian format,
which is what it returns.

This fixes the tests on big endian.

Signed-off-by: Martin Storsjö <martin@martin.st>
 2014-04-19 21:41:34 +03:00
Michael Niedermayer 0c67ef2729 Merge commit '86a0432688216562926d4aee36118f01be6d5e1b' 
* commit '86a0432688216562926d4aee36118f01be6d5e1b':
  Silicon Graphics Motion Video Compressor 1 & 2 decoder

Conflicts:
	Changelog
	libavcodec/avcodec.h
	libavcodec/mvcdec.c
	libavcodec/version.h

See: 746b1dcc98
Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2014-04-19 19:47:58 +02:00
Michael Niedermayer e37dbfddda Merge commit '07761294fc3f08e139e8a406ef7d5b63aaf1ecee' 
* commit '07761294fc3f08e139e8a406ef7d5b63aaf1ecee':
  Silicon Graphics RLE 8-bit video decoder

Conflicts:
	Changelog
	doc/general.texi
	libavcodec/avcodec.h
	libavcodec/sgirledec.c
	libavcodec/version.h

See: afa1617b93
Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2014-04-19 19:26:46 +02:00
Michael Niedermayer 928b5708f9 Merge commit '34c5a6660a9e5e3cf301691bb29d011638953dc2' 
* commit '34c5a6660a9e5e3cf301691bb29d011638953dc2':
  h264: codec reinit: remove statements without effect

Conflicts:
	libavcodec/h264_slice.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2014-04-19 18:50:32 +02:00
Michael Niedermayer c1bc20bfd9 Merge commit '6ef96292d99302a59f824713fc763f6abd3754df' 
* commit '6ef96292d99302a59f824713fc763f6abd3754df':
  utils: add yvyu422 to avcodec_align_dimensions2

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2014-04-19 18:38:39 +02:00
Clément Bœsch 010732b73a vp9/x86: simplify FILTER_INIT. 
In the 2 FILTER_INIT usages, the source is already preloaded so that
extra complexity taken from FILTER_UPDATE is not necessary.

Also add forgotten "mask" argument in FILTER_{INIT,UPDATE} comments.
 2014-04-19 17:30:33 +02:00
Clément Bœsch b8d002dc95 vp9/x86: clarify mixed splatb. 2014-04-19 17:00:51 +02:00
Peter Ross 86a0432688 Silicon Graphics Motion Video Compressor 1 & 2 decoder 
Signed-off-by: Vittorio Giovara <vittorio.giovara@gmail.com>
 2014-04-19 16:24:26 +02:00
Peter Ross 07761294fc Silicon Graphics RLE 8-bit video decoder 
Signed-off-by: Vittorio Giovara <vittorio.giovara@gmail.com>
 2014-04-19 16:24:26 +02:00
Janne Grunau 34c5a6660a h264: codec reinit: remove statements without effect 
avctx->coded_{height,width} will always equal h->{height,width} since
init_dimensions() does that explicitly, Size changes are detected by
changes in mb_{height,width} earlier and propagated through the
needs_reinit variable.
 2014-04-19 16:22:06 +02:00
Vittorio Giovara 6ef96292d9 utils: add yvyu422 to avcodec_align_dimensions2 2014-04-19 16:20:58 +02:00
Carl Eugen Hoyos b38910c979 Fix compilation with !HAVE_6REGS. 
Can be tested with:
$ ./configure --cc='cc -m32' --disable-optimizations --enable-pic
 2014-04-19 09:56:01 +02:00
Carl Eugen Hoyos 72c93abaad Use MANGLE in cavsdsp.c to save two registers using gcc. 
Fixes compilation with !HAVE_6REGS.
 2014-04-19 09:54:26 +02:00
Michael Niedermayer 60c8c7144e avcodec/qtrleenc: use av_mallocz_array() 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-04-18 20:43:02 +02:00
Michael Niedermayer 683b6e3183 avcodec/smacker: use av_mallocz_array() 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-04-18 20:43:02 +02:00
Michael Niedermayer 9b888fb159 avcodec/roqvideoenc: use av_malloc(z)_array() 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-04-18 20:43:02 +02:00
Justin Ruggles 591c0c26b5 mjpeg: cosmetics: indentation 
Signed-off-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
 2014-04-18 12:41:17 -04:00
Justin Ruggles 39ef000e19 mjpeg: Do not fail jpeg decoding on bad EXIF data. 
It is not required to correctly decode the image.

Signed-off-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
 2014-04-18 12:41:10 -04:00
Michael Niedermayer 71f8cdcc16 avcodec/snow: use av_malloc(z)_array() 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-04-18 15:22:29 +02:00
Michael Niedermayer bb0d9aedcb avcodec/tta: use av_malloc(z)_array() 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-04-18 15:19:09 +02:00
Michael Niedermayer b9831364de avcodec/vc1dec: use av_realloc_array() 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-04-18 15:15:08 +02:00
Carl Eugen Hoyos 941b2240f2 Do not overwrite VDPAU structures in ff_MPV_frame_start(). 
Fixes crashes with VDR and MPlayer as reported by irc user crow.
 2014-04-18 05:08:24 +02:00
James Almer 197fe392db x86/dsputil: use HADDD where applicable 
Signed-off-by: James Almer <jamrial@gmail.com>
Reviewed-by: "Ronald S. Bultje" <rsbultje@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-04-17 14:15:35 +02:00
James Almer 76ed71a72b x86: move horizontal add macros to x86util 
Also port relevant AVX2/XOP optimizations from x264 with permission
to relicense to LGPL from the corresponding authors

Signed-off-by: James Almer <jamrial@gmail.com>
Reviewed-by: "Ronald S. Bultje" <rsbultje@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-04-17 14:15:09 +02:00
Michael Niedermayer 58a53123ba avcodec/vble: use av_malloc_array() 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-04-16 19:45:43 +02:00
Michael Niedermayer cb53beb81a iavcodec/vc1dec: Fix missing {} 
Fixes part of Ticket3466
Found-by: Andrey_Karpov / PVS-Studio
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-04-16 03:56:39 +02:00
Michael Niedermayer 1457f3fd90 avcodec/g723_1: add assert to help static code analyzers 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-04-16 02:55:13 +02:00
Michael Niedermayer b8598f6ce6 avcodec/diracdec: fix undefined behavior with shifts 
Fixes part of Ticket3466
Found-by: Andrey_Karpov / PVS-Studio
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-04-16 02:51:41 +02:00
Michael Niedermayer 230db1426d avcodec/fic: Fix return value check 
Fixes part of Ticket3466
Found-by: Andrey_Karpov / PVS-Studio
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-04-16 02:32:37 +02:00
Michael Niedermayer f202af29c9 avcodec/dcadec: fix error message suppression code 
Fixes part of Ticket3466
Found-by: Andrey_Karpov / PVS-Studio
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-04-16 02:24:12 +02:00
Michael Niedermayer 256f530603 avcodec/mjpegen: Fix declared argument size 
Fixes part of Ticket3466
Found-by: Andrey_Karpov / PVS-Studio
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-04-16 02:14:14 +02:00
Peter Ross 5f4f9ee99f Direct Stream Digital (DSD) decoder 
Signed-off-by: Peter Ross <pross@xvid.org>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-04-15 20:35:57 +02:00
Michael Niedermayer c6902f96d7 avcodec/mpegaudioenc_template: Fix integer overflow 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-04-15 15:09:57 +02:00
Michael Niedermayer 2adcd15f2e Merge commit 'a6ac4fcce44108f6f87278b8d12e890576f46a62' 
* commit 'a6ac4fcce44108f6f87278b8d12e890576f46a62':
  vp78: Align the intra4x4_pred_mode_top array within VP8Macroblock

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2014-04-15 01:23:00 +02:00
Martin Storsjö a6ac4fcce4 vp78: Align the intra4x4_pred_mode_top array within VP8Macroblock 
This array is written using AV_WN32A, assuming alignment.

This hopefully fixes the failing vp7 fate test on sparc.

Signed-off-by: Martin Storsjö <martin@martin.st>
 2014-04-14 21:27:20 +03:00