generic-library/ffmpeg
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity
62,510 Commits 24 Branches 241 Tags 173 MiB
97751e1324
Commit Graph

28219 Commits

Author SHA1 Message Date
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
Michael Niedermayer
3df787a1ef Merge branch 'flac' of https://github.com/FernetMenta/FFmpeg 
Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2014-04-14 18:35:02 +02:00
Michael Niedermayer
46d5625f44 avcodec/x86/idct_sse2_xvid: fix non C99 inline function 
Found-by: Matt Oliver <protogonoi@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-04-14 18:04:57 +02:00
Rainer Hochecker
e1fcd3a007 flac demuxer: improve seeking 2014-04-14 17:43:19 +02:00
Carl Eugen Hoyos
ef48ac6523 Set the bitrate when decoding speex. 
The bitrate of the first frame is used as bitrate for the speex stream.
 2014-04-14 15:36:01 +02:00
Michael Niedermayer
9468e9e5a2 Merge commit 'b3d905b702dcdda9e3ae2bcb7b5580ca77a96ab7' 
* commit 'b3d905b702dcdda9e3ae2bcb7b5580ca77a96ab7':
  dcadec: Delete redundant init_get_bits call

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2014-04-14 14:44:58 +02:00
Niels Möller
b3d905b702 dcadec: Delete redundant init_get_bits call 
No initialization is needed in dca_decode_frame, because the next
thing it does is calling dca_parse_frame_header, which takes care of
the needed initialization.

Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
 2014-04-14 11:56:26 +02:00
Michael Niedermayer
4b8e7a1414 avcodec/utils: prettify remap_deprecated_codec_id() 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-04-13 23:54:49 +02:00
Michael Niedermayer
d42a61922b avcodec/psymodel: use av_malloc(z)_array() 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-04-13 23:36:59 +02:00
Michael Niedermayer
5ec8192949 avcodec/fft-test: use av_malloc_array() 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-04-13 23:36:59 +02:00
James Almer
0f524b6c69 x86/synth_filter: remove the fma3 version ifdefs 
This fixes compilation failures with --disable-fma3

Signed-off-by: James Almer <jamrial@gmail.com>
Signed-off-by: Anton Khirnov <anton@khirnov.net>
 2014-04-13 11:29:28 +02:00
Michael Niedermayer
1dc2d4a8ef avcodec/tiff: remove unused variables 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-04-13 04:33:20 +02:00
Michael Niedermayer
a676e48d39 Merge commit '801c39e1e3058fc4ba822bfb5d8612d777111e32' 
* commit '801c39e1e3058fc4ba822bfb5d8612d777111e32':
  dcadec: Use correct channel count in stereo downmix check

Conflicts:
	libavcodec/dcadec.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2014-04-13 04:23:56 +02:00
Michael Niedermayer
952614b899 Merge commit 'c8cf461c19e8e35df4b7364d9b90aa42f1ab4560' 
* commit 'c8cf461c19e8e35df4b7364d9b90aa42f1ab4560':
  dcadec: Do not decode the XCh extension when downmixing to stereo

Conflicts:
	libavcodec/dcadec.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2014-04-13 04:07:27 +02:00
Michael Niedermayer
a64d6d5152 Merge commit '345a96c327e8f2a8077189af9f5e8d2b3f4ad5fe' 
* commit '345a96c327e8f2a8077189af9f5e8d2b3f4ad5fe':
  tiffdec: remove an unneeded variable

Conflicts:
	libavcodec/tiff.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2014-04-13 03:54:11 +02:00
Michael Niedermayer
b9b2f9d218 Merge commit 'a9b046fb0ae5395c4d1d8a82cd0d3e354b5034ed' 
* commit 'a9b046fb0ae5395c4d1d8a82cd0d3e354b5034ed':
  tiff: use a better name and enum values for PhotometricInterpretation

Conflicts:
	libavcodec/tiff.c
	libavcodec/tiff.h
	libavcodec/tiffenc.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2014-04-13 03:45:45 +02:00
Michael Niedermayer
75b4e40137 Merge commit 'fdbe18b7b0545f9b5923d25a5433e4f735719ecc' 
* commit 'fdbe18b7b0545f9b5923d25a5433e4f735719ecc':
  tiffdec: use a single strip if RowsPerStrip is 0

Conflicts:
	libavcodec/tiff.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2014-04-13 03:30:02 +02:00
Michael Niedermayer
94cf83ff91 Merge commit '0a467a9b594dd67aa96bad687d05f8845b009f18' 
* commit '0a467a9b594dd67aa96bad687d05f8845b009f18':
  tiffdec: use bytestream2 to simplify overread/overwrite protection

Conflicts:
	libavcodec/tiff.c

See: 1ec83d9a9e
Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2014-04-13 03:20:09 +02:00
Michael Niedermayer
31876ea620 Merge commit '5748faf291fec297ef25d81962b52b3438f54278' 
* commit '5748faf291fec297ef25d81962b52b3438f54278':
  bytestream: add bytestream2_copy_buffer() functions

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2014-04-13 02:06:47 +02:00
Michael Niedermayer
6145b1d9c1 Merge commit 'bf2064f046af64c59a416c814474a39b0a457569' 
* commit 'bf2064f046af64c59a416c814474a39b0a457569':
  tiffdec: rename variables for consistency and fix variable shadowing

Conflicts:
	libavcodec/tiff.c

See: 251345a3fe
Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2014-04-13 01:49:19 +02:00
Tim Walker
801c39e1e3 dcadec: Use correct channel count in stereo downmix check 
s->prim_channels is greater than num_core_channels
when an XCh extension is present in the bitstream.

Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
 2014-04-12 23:05:37 +02:00
Tim Walker
c8cf461c19 dcadec: Do not decode the XCh extension when downmixing to stereo 
This is neither necessary nor currently supported.

Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
 2014-04-12 23:05:07 +02:00
Justin Ruggles
345a96c327 tiffdec: remove an unneeded variable 2014-04-12 14:52:10 -04:00
Jean First
e75ef2b7f4 tiffdec: support predictor type 2 with RGB48 pixel format 2014-04-12 14:52:10 -04:00
Justin Ruggles
a9b046fb0a tiff: use a better name and enum values for PhotometricInterpretation 
Also add additional known values and log as missing features.
 2014-04-12 14:52:07 -04:00
Justin Ruggles
fdbe18b7b0 tiffdec: use a single strip if RowsPerStrip is 0 
The spec does not specify that 0 is an error condition, and there
are samples which use 0 when the whole image is in one strip.
 2014-04-12 14:49:08 -04:00
Justin Ruggles
0a467a9b59 tiffdec: use bytestream2 to simplify overread/overwrite protection 
Based on a patch by Paul B Mahol <onemda@gmail.com>

CC:libav-stable@libav.org
 2014-04-12 14:49:08 -04:00
Justin Ruggles
5748faf291 bytestream: add bytestream2_copy_buffer() functions 
This is basically an overread/overwrite-safe memcpy between a
GetByteContext and a PutByteContext.

CC:libav-stable@libav.org
 2014-04-12 14:49:08 -04:00
Paul B Mahol
de9d2705f6 bytestream: add functions for accessing size of buffer 
Signed-off-by: Paul B Mahol <onemda@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Signed-off-by: Justin Ruggles <justin.ruggles@gmail.com>

CC:libav-stable@libav.org
 2014-04-12 14:49:08 -04:00
Jean First
bf2064f046 tiffdec: rename variables for consistency and fix variable shadowing 
Signed-off-by: Justin Ruggles <justin.ruggles@gmail.com>
 2014-04-12 14:49:07 -04:00
Justin Ruggles
58bc38a5f2 tiffdec: use correct data type for palette entries and set alpha to 0xFF 2014-04-12 14:49:07 -04:00
Michael Niedermayer
e89f3d0ed2 avcodec/ffv1: use av_malloc_array() 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-04-12 15:41:00 +02:00
Michael Niedermayer
713e62e91d avcodec/faxcompr: use av_malloc_array() 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-04-12 15:37:57 +02:00
Michael Niedermayer
36053aeff6 vcodec/error_resilience: use av_malloc_array() 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-04-12 15:33:55 +02:00
Michael Niedermayer
fb4ac46d7f avcodec/elbg: Use av_malloc(z)_array() 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-04-12 05:40:37 +02:00
Michael Niedermayer
46375e9a97 avcodec/diracdec: use av_malloc(z)_array 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-04-12 05:38:31 +02:00
Michael Niedermayer
66e959682c avcodec/mpegvideo_enc: override bitrate tolerance when its value is too small 
Fixes Ticket3257

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-04-12 01:29:20 +02:00
Michael Niedermayer
27763db928 Merge remote-tracking branch 'cehoyos/master' 
* cehoyos/master:
  Improve amr bitrate calculation for VBR files.
  Warn if rawvideo and an unreadable pix_fmt are written.

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2014-04-12 00:17:35 +02:00