generic-library/ffmpeg
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity
56,933 Commits 24 Branches 241 Tags 173 MiB
8f2386b589
Commit Graph

25607 Commits

Author SHA1 Message Date
Michael Niedermayer
e1c3e6277f Merge commit 'f0389eb777b1ab4291329d4f709098cdfa7384dc' 
* commit 'f0389eb777b1ab4291329d4f709098cdfa7384dc':
  arm: fmtconvert: Split armv6 fmtconvert code off from vfp code

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2013-08-29 16:10:39 +02:00
Michael Niedermayer
99e7c702db Merge commit 'bd549cbaacd33dfb7be81d0619c9b107b8a85be7' 
* commit 'bd549cbaacd33dfb7be81d0619c9b107b8a85be7':
  arm: dcadsp: Move synth filter initialization to dcadsp file

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2013-08-29 16:00:45 +02:00
Michael Niedermayer
4399e72723 Merge commit '6af2c351b3ae61e4478950ffddd0dfcad06188b8' 
* commit '6af2c351b3ae61e4478950ffddd0dfcad06188b8':
  ppc: Add missing AltiVec cpuflag detection invocations

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2013-08-29 15:04:59 +02:00
Michael Niedermayer
3e75f98667 Merge commit 'de81b6ae4f38273ff27020f494cc46539110d34b' 
* commit 'de81b6ae4f38273ff27020f494cc46539110d34b':
  ppc: fdct: Remove vim editor settings comment

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2013-08-29 15:00:02 +02:00
Michael Niedermayer
8251529ff3 Merge commit '70dd8892bf00923af838756dfbb356a9b1e4e40d' 
* commit '70dd8892bf00923af838756dfbb356a9b1e4e40d':
  mpegvideo: Replace arch initialization ifdeffery by standard conditionals

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2013-08-29 14:53:44 +02:00
Michael Niedermayer
37494bdb0d Merge commit 'cd529172377229f2e86987869ccc08f426bfe114' 
* commit 'cd529172377229f2e86987869ccc08f426bfe114':
  x86: rv40dsp: Move inline assembly optimizations out of YASM init section

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2013-08-29 14:48:46 +02:00
Michael Niedermayer
477641e9f8 Merge commit 'a64f6a04ac5773aeff2003897455dadb9609f18b' 
* commit 'a64f6a04ac5773aeff2003897455dadb9609f18b':
  dsputil: x86: Hide arch-specific initialization details

Conflicts:
	libavcodec/x86/Makefile

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2013-08-29 14:32:05 +02:00
Michael Niedermayer
29daad5b98 Merge commit 'f61bece684d9685b07895508e6c1c733b5564ccf' 
* commit 'f61bece684d9685b07895508e6c1c733b5564ccf':
  ppc: Add and use convenience macro to check for AltiVec availability

Conflicts:
	libavcodec/ppc/dsputil_ppc.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2013-08-29 14:24:07 +02:00
Diego Biurrun
e998b56362 x86: avcodec: Consistently structure CPU extension initialization 2013-08-29 13:07:37 +02:00
Diego Biurrun
6369ba3c9c x86: avcodec: Use convenience macros to check for CPU flags 2013-08-29 13:07:37 +02:00
Paul B Mahol
d49f2603be truemotion2: check return value of av_malloc(z) 
Signed-off-by: Paul B Mahol <onemda@gmail.com>
 2013-08-29 10:46:42 +00:00
Diego Biurrun
a6b6501185 ppc: cosmetics: Consistently format CPU flag detection invocations 2013-08-29 11:31:32 +02:00
Diego Biurrun
67e6a9f558 cosmetics: Place arch initialization calls in alphabetical order 2013-08-29 11:24:14 +02:00
Diego Biurrun
f0389eb777 arm: fmtconvert: Split armv6 fmtconvert code off from vfp code 2013-08-29 11:24:14 +02:00
Diego Biurrun
bd549cbaac arm: dcadsp: Move synth filter initialization to dcadsp file 2013-08-29 11:24:14 +02:00
Diego Biurrun
6af2c351b3 ppc: Add missing AltiVec cpuflag detection invocations 2013-08-29 00:24:46 +02:00
Diego Biurrun
de81b6ae4f ppc: fdct: Remove vim editor settings comment 2013-08-28 23:59:24 +02:00
Diego Biurrun
70dd8892bf mpegvideo: Replace arch initialization ifdeffery by standard conditionals 2013-08-28 23:59:24 +02:00
Diego Biurrun
cd52917237 x86: rv40dsp: Move inline assembly optimizations out of YASM init section 2013-08-28 23:59:24 +02:00
Diego Biurrun
a64f6a04ac dsputil: x86: Hide arch-specific initialization details 
Also give consistent names to init functions.
 2013-08-28 23:59:24 +02:00
Diego Biurrun
f61bece684 ppc: Add and use convenience macro to check for AltiVec availability 2013-08-28 23:54:15 +02:00
Rafaël Carré
91d4cfb812 apedec: do not buffer decoded samples over AVPackets 
Only consume an AVPacket when all the samples have been read.

When the rate of samples output is limited (by the default value
of max_samples), consuming the first packet immediately will cause
timing problems:

- The first packet with PTS 0 will output 4608 samples and be
consumed entirely
- The second packet with PTS 64 will output the remaining samples
(typically, a lot, that's why max_samples exist) until the decoded
samples of the first packet have been exhausted, at which point the
samples of the second packet will be decoded and output when
av_decode_frame is called with the next packet).

That means there's a PTS jump since the first packet is 'decoded'
immediately, which can be seen with avplay or mplayer: the timing
jumps immediately to 6.2s (which is the size of a packet).

Sample: http://streams.videolan.org/issues/6348/Goldwave-MAClib.ape
Signed-off-by: Justin Ruggles <justin.ruggles@gmail.com>
 2013-08-28 15:00:34 -04:00
Michael Niedermayer
90411f7ed6 snowenc: Fix memleak of the ratecontrol related memory 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-08-28 20:53:21 +02:00
Michael Niedermayer
f13e733145 avcodec/snow: check for malloc* failures 
Also return and pass on error codes where needed for this

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-08-28 17:09:46 +02:00
Michael Niedermayer
129f50692e snowenc: check for memory allocation failures 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-08-28 16:52:30 +02:00
Michael Niedermayer
7efa9b1794 Merge commit 'b1f9cdc37ff5d5b391d2cd9af737ab4e5a0fc1c0' 
* commit 'b1f9cdc37ff5d5b391d2cd9af737ab4e5a0fc1c0':
  ac3: Return proper error codes

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2013-08-28 12:28:25 +02:00
Michael Niedermayer
bfa1b42b3c Merge commit '818d1f1a3e89d35213af0bd5dc4a772713951882' 
* commit '818d1f1a3e89d35213af0bd5dc4a772713951882':
  ac3: Clean up the error paths

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2013-08-28 12:16:10 +02:00
Michael Niedermayer
f0ee0341b0 Merge commit '6258d362b82934a2c27557e0984aed372d98091a' 
* commit '6258d362b82934a2c27557e0984aed372d98091a':
  ac3: Do not clash with normal AVERROR

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2013-08-28 12:09:41 +02:00
Luca Barbato
b1f9cdc37f ac3: Return proper error codes 2013-08-27 16:19:12 +02:00
Luca Barbato
818d1f1a3e ac3: Clean up the error paths 2013-08-27 16:19:12 +02:00
Luca Barbato
6258d362b8 ac3: Do not clash with normal AVERROR 
The parsing function return AVERROR and AAC_AC3_PARSE_ERROR values,
make sure they are not misunderstood.
 2013-08-27 16:19:12 +02:00
Paul B Mahol
b74213db08 wavpackenc: remove duplicate 'const' declaration specifier 
Signed-off-by: Paul B Mahol <onemda@gmail.com>
 2013-08-26 19:30:45 +00:00
Paul B Mahol
e6e26b8a91 msrledec: use memset() 
Signed-off-by: Paul B Mahol <onemda@gmail.com>
 2013-08-26 19:26:01 +00:00
Paul B Mahol
6638738968 msrledec: use bytestream2_get_bufferu() 
Signed-off-by: Paul B Mahol <onemda@gmail.com>
 2013-08-26 19:26:00 +00:00
Paul B Mahol
f12c27daf7 sgidec: use bytestream2_get_bufferu() 
Signed-off-by: Paul B Mahol <onemda@gmail.com>
 2013-08-26 19:26:00 +00:00
Michael Niedermayer
fcaf5fa2ea avcodec/fft-test: put ff_dct* code under CONFIG_DCT 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-08-26 20:39:22 +02:00
Michael Niedermayer
d5f616ed87 avcodec: dct_test needs CONFIG_DCT 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-08-26 20:19:01 +02:00
Michael Niedermayer
abe76b851c ffv1enc: Make ffv1.3 non experimental 
The fate tests change as they used 1.2 previously
The increased size is due to:
32bit CRCs per slice by default (can be disabled),
it adds slice headers to allow decoding one slice without the others
an additional slice size field is added to make it possible to find
slices within corrupted surroundings.

these add up to about 57bit per slice more
at 50 frames and 4 slices thats 1425 byte

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-08-26 17:33:53 +02:00
Michael Niedermayer
09ea5048a9 Merge remote-tracking branch 'qatar/master' 
* qatar/master:
  imc: support mode 1

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2013-08-26 14:53:15 +02:00
Michael Niedermayer
6063f012f2 Merge commit '9e7b62f0fb7462a902330fcc82cf596388f0187b' 
* commit '9e7b62f0fb7462a902330fcc82cf596388f0187b':
  twinvq: set block align for codecs and use it in size checks

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2013-08-26 14:47:15 +02:00
Kostya Shishkov
4eb4bb3a02 imc: support mode 1 2013-08-26 09:23:45 +02:00
Kostya Shishkov
9e7b62f0fb twinvq: set block align for codecs and use it in size checks 
This both allows factoring out size check for both MetaSound and TwinVQ-VQF
decoders and fixes the situation when there are several MetaSound frames
stuffed together (that happens in 8kHz @ 8kbps MetaSound in ASF for example).
 2013-08-26 09:23:39 +02:00
Michael Niedermayer
21ba80214c Merge remote-tracking branch 'qatar/master' 
* qatar/master:
  h264_cabac: Mark functions calling decode_cabac_residual_internal as noinline

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2013-08-25 12:26:14 +02:00
Michael Niedermayer
626739ebbb avcodec/h264: Free rbsp_buffer before copying context over it 
Fixes memleak
Fixes Ticket1900

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-08-25 03:30:31 +02:00
Michael Niedermayer
be30e44dd9 avcodec/h264: Zero rbsp_buffer earler to ensure no duplicated pointers can leak 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-08-25 03:29:52 +02:00
Michael Niedermayer
ecbf838c7d h264: prevent rbsp_buffer values from becoming duplicated 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-08-25 03:01:19 +02:00
Michael Niedermayer
f55a7ba037 avcodec/ituh263dec: detect and warn about RTP 
Fixes Ticket925
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-08-24 23:06:59 +02:00
Michael Niedermayer
7495186fd4 avcodec/h263dec: fix aspect of lead h263 EHC 
Fixes part of ticket925

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-08-24 18:59:58 +02:00
Diego Biurrun
ff9d57e7df h264_cabac: Mark functions calling decode_cabac_residual_internal as noinline 
This ensures that decode_cabac_residual_internal actually does get inlined,
which it otherwise does not, even though it is marked as always_inline.
 2013-08-24 16:14:15 +02:00
Michael Niedermayer
6067186f3a Merge remote-tracking branch 'qatar/master' 
* qatar/master:
  arm: h264chroma: Do not compile h264_chroma_mc* dependent on h264 decoder

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2013-08-24 11:30:57 +02:00
Michael Niedermayer
edf6fb64e0 Merge commit '84784c297fe6a6e538a7e111dcdbd8b893c2d275' 
* commit '84784c297fe6a6e538a7e111dcdbd8b893c2d275':
  libfdk-aacdec: formatting cosmetics

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2013-08-24 11:23:25 +02:00
Michael Niedermayer
f9418d156f Merge commit '8506ff97c9ea4a1f52983497ecf8d4ef193403a9' 
* commit '8506ff97c9ea4a1f52983497ecf8d4ef193403a9':
  vp56: Mark VP6-only optimizations as such.

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2013-08-24 11:04:11 +02:00
Michael Niedermayer
b99d3613cf avcodec/h263dec: use FF_CEIL_RSHIFT() 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-08-24 04:09:43 +02:00
Michael Niedermayer
9a271a9368 jpeg2000: check log2_cblk dimensions 
Fixes out of array access
Fixes Ticket2895

Found-by: Piotr Bandurski <ami_stuff@o2.pl>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-08-24 03:42:54 +02:00
Paul B Mahol
b8ff4f5ea3 truemotion1: check av_fast_malloc() return value 
Signed-off-by: Paul B Mahol <onemda@gmail.com>
 2013-08-23 23:22:39 +00:00
Paul B Mahol
83b915d495 truemotion1: use av_freep() 
Signed-off-by: Paul B Mahol <onemda@gmail.com>
 2013-08-23 23:22:39 +00:00
Michael Niedermayer
5cc8b81687 mpeg4videodec: fix GEOV/GEOX fliping 
Fixes Ticket317
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-08-24 01:04:23 +02:00
Michael Niedermayer
3941a4f5c2 snowenc: change a bunch of assert() to av_assert() 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-08-24 01:00:00 +02:00
Paul B Mahol
2a75459519 pngdec: do not release buffer on failure instead report full progress 
Should fix heap-use-after-free as reported by Address Sanitizer.

Signed-off-by: Paul B Mahol <onemda@gmail.com>
 2013-08-23 21:08:32 +00:00
Michael Niedermayer
9e477a3770 jpeg2000: fix null pointer dereference in case of malloc failure 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-08-23 18:06:54 +02:00
Michael Niedermayer
09927f3eaa jpeg2000: zero reslevel array on allocation 
prevent use of uninitialized values

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-08-23 18:06:54 +02:00
Michael Niedermayer
912ce9dd20 jpeg2000: fix dereferencing invalid pointers 
Found-by: Laurent Butti <laurentb@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-08-23 17:36:53 +02:00
Diego Biurrun
f407856968 arm: h264chroma: Do not compile h264_chroma_mc* dependent on h264 decoder 
The functions are used by all codecs that enable the h264chroma component
and the file is already compiled conditional on h264chroma being enabled.
 2013-08-23 17:21:14 +02:00
Diego Biurrun
84784c297f libfdk-aacdec: formatting cosmetics 2013-08-23 17:11:47 +02:00
Diego Biurrun
8506ff97c9 vp56: Mark VP6-only optimizations as such. 
Most of our VP56 optimizations are VP6-only and will stay that way.
So avoid compiling them for VP5-only builds.
 2013-08-23 14:42:19 +02:00
Paul B Mahol
dd1d29bd5f pngdec: use av_fast_padded_malloc(z) 
Signed-off-by: Paul B Mahol <onemda@gmail.com>
 2013-08-23 10:29:33 +00:00
Michael Niedermayer
16a0d75c76 avcodec/mjpegdec: fix overread in find_marker() 
Found-by: Laurent Butti <laurentb@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-08-23 04:44:55 +02:00
Carl Eugen Hoyos
2baa12f1d1 Fix dependencies for h263 vaapi decoder. 2013-08-23 02:11:49 +02:00
Michael Niedermayer
8bb11c3ca7 avcodec/jpeg2000dec: Check cdx/y values more carefully 
Some invalid values where not handled correctly in the later pixel
format matching code.
Fixes out of array accesses
Fixes Ticket2848

Found-by: Piotr Bandurski <ami_stuff@o2.pl>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-08-23 01:02:03 +02:00
Paul B Mahol
6e643239d9 pngdec: frame multithreading support 
Signed-off-by: Paul B Mahol <onemda@gmail.com>
 2013-08-22 13:14:25 +00:00
Michael Niedermayer
f903b42663 Merge remote-tracking branch 'qatar/master' 
* qatar/master:
  x86: Split DCT and FFT initialization into separate files

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2013-08-22 14:28:42 +02:00
Michael Niedermayer
503aec1425 Merge commit '0b45269c2d732d15afa2de9c475d85fcf5561ac4' 
* commit '0b45269c2d732d15afa2de9c475d85fcf5561ac4':
  x86: h264_idct: Remove incorrect comment

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2013-08-22 13:04:07 +02:00
Michael Niedermayer
3819db745d avcodec/rpza: Perform pointer advance and checks before using the pointers 
Fixes out of array accesses
Fixes Ticket2850

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-08-22 01:26:02 +02:00
Paul B Mahol
920046abf1 loco: use init_get_bits8() 
Signed-off-by: Paul B Mahol <onemda@gmail.com>
 2013-08-21 20:29:05 +00:00
Paul B Mahol
71c378984b qtrle: make code independent of sizeof(AVFrame) 
Signed-off-by: Paul B Mahol <onemda@gmail.com>
 2013-08-21 19:27:31 +00:00
Paul B Mahol
5c9d44d66b qtrle: use memcpy() 
Signed-off-by: Paul B Mahol <onemda@gmail.com>
 2013-08-21 19:18:05 +00:00
Paul B Mahol
d5f547389b qtrle: use uint16_t and (u)int8_t instead of unsigned short and unsigned char 
Signed-off-by: Paul B Mahol <onemda@gmail.com>
 2013-08-21 19:18:05 +00:00
Paul B Mahol
925d0837b9 qtrle: use bytestream2_get_buffer() 
Signed-off-by: Paul B Mahol <onemda@gmail.com>
 2013-08-21 19:18:05 +00:00
Paul B Mahol
9a5aa2c48e avcodec/mdec: use init_get_bits8() 
Signed-off-by: Paul B Mahol <onemda@gmail.com>
 2013-08-21 18:35:58 +00:00
Diego Biurrun
e7b31844f6 x86: Split DCT and FFT initialization into separate files 2013-08-21 20:15:27 +02:00
Thilo Borgmann
ffa18de2e6 configure: Add exif to CONFIG_EXTRA. 
Add exif as a common component in CONFIG_EXTRA in order to avoid many
dependencies to 'exif.o tiff_common.o' in lavc/Makefile.
 2013-08-21 19:00:48 +02:00
Diego Biurrun
0b45269c2d x86: h264_idct: Remove incorrect comment 2013-08-21 15:09:58 +02:00
Michael Niedermayer
3d842cf827 Merge remote-tracking branch 'qatar/master' 
* qatar/master:
  avcodec/utils: Simplify a condition that combines HAVE_NEON and ARCH_ARM

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2013-08-21 13:08:55 +02:00
Michael Niedermayer
70a73213b7 Merge commit 'c18838f5eb7d7001a9dc653f5162868c04c1b2a1' 
* commit 'c18838f5eb7d7001a9dc653f5162868c04c1b2a1':
  h264_ps: Use more meaningful error values

Conflicts:
	libavcodec/h264_ps.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2013-08-21 13:03:40 +02:00
Michael Niedermayer
e853cf5325 Merge commit '330ad1f6a53a37dec228cb424ca57e1268fafc64' 
* commit '330ad1f6a53a37dec228cb424ca57e1268fafc64':
  h264_ps: K&R formatting cosmetics

Conflicts:
	libavcodec/h264_ps.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2013-08-21 12:56:37 +02:00
Michael Niedermayer
8299ed261a Merge commit '8fed466b0a7d636ae5035f9c6074fba9a621539b' 
* commit '8fed466b0a7d636ae5035f9c6074fba9a621539b':
  h264_ps: Drop commented-out cruft

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2013-08-21 12:32:33 +02:00
Michael Niedermayer
16466d92b9 Merge commit 'c4e43560fe6677e9d60bfb3cffc41c7324e92a0b' 
* commit 'c4e43560fe6677e9d60bfb3cffc41c7324e92a0b':
  h264data: Move some tables to the only place they are used

Conflicts:
	libavcodec/h264data.h

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2013-08-21 12:21:48 +02:00
Michael Niedermayer
e9cb43c6f6 Merge commit 'f34de1486aa0eb147d46ba5d2cb86a17407bb7ce' 
* commit 'f34de1486aa0eb147d46ba5d2cb86a17407bb7ce':
  h264data: Remove unused luma_dc_field_scan table

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2013-08-21 12:12:10 +02:00
Michael Niedermayer
614cf1a613 Merge commit '4f2b469da5e4ae221718ae479f6af627cfdebb91' 
* commit '4f2b469da5e4ae221718ae479f6af627cfdebb91':
  Add a libfdk-aac decoder

Conflicts:
	configure
	libavcodec/version.h

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2013-08-21 12:05:19 +02:00
Michael Niedermayer
58e12732db Merge commit '2a61592573d725956a4377641344afe263382648' 
* commit '2a61592573d725956a4377641344afe263382648':
  avcodec: Remove some commented-out debug cruft

Conflicts:
	libavcodec/h264_cabac.c
	libavcodec/h264_cavlc.c
	libavcodec/h264_loopfilter.c
	libavcodec/h264_mvpred.h
	libavcodec/mjpegdec.c
	libavcodec/mjpegenc.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2013-08-21 11:18:43 +02:00
Diego Biurrun
e95930eda1 avcodec/utils: Simplify a condition that combines HAVE_NEON and ARCH_ARM 2013-08-21 09:40:39 +02:00
Michael Niedermayer
880c73cd76 avcodec/flashsv: check diff_start/height 
Fixes out of array accesses
Fixes Ticket2844

Found-by: ami_stuff
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-08-20 23:18:48 +02:00
Diego Biurrun
c18838f5eb h264_ps: Use more meaningful error values 2013-08-20 21:24:42 +02:00
Diego Biurrun
330ad1f6a5 h264_ps: K&R formatting cosmetics 2013-08-20 21:23:24 +02:00
Diego Biurrun
8fed466b0a h264_ps: Drop commented-out cruft 2013-08-20 21:09:05 +02:00
Diego Biurrun
c4e43560fe h264data: Move some tables to the only place they are used 2013-08-20 20:49:37 +02:00
Diego Biurrun
f34de1486a h264data: Remove unused luma_dc_field_scan table 2013-08-20 20:49:37 +02:00
Martin Storsjö
4f2b469da5 Add a libfdk-aac decoder 
This can be useful for decoding AAC object types that are not supported
by the native AAC decoder, e.g. AAC-LD and AAC-ELD.
 2013-08-20 14:27:27 -04:00
Diego Biurrun
2a61592573 avcodec: Remove some commented-out debug cruft 2013-08-20 19:59:50 +02:00
Michael Niedermayer
d9b0b54a5f ffv1: rename minor to micro version 
the version is 1.3.4 which makes 4 micro and not minor

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-08-20 03:30:36 +02:00
Michael Niedermayer
68b63a3432 mpegvideo: Use picture_ptr instead of picture in ff_mpeg_draw_horiz_band() 
Fixes strides and issue with mplayer and mpeg2 field pictures

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-08-20 00:19:21 +02:00
Michael Niedermayer
63c0e9077e avcodec/jpeg2000dec: fix near null pointer dereference 
Fixes Ticket2840

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-08-18 18:44:12 +02:00
Michael Niedermayer
7d776062f9 avcodec/error_resilience: Fix handling of matrox mpeg2 
Fixes Ticket2615

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-08-18 14:37:12 +02:00
Michael Niedermayer
70967a60df mpeg12dec: also print progressive seq and chroma format 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-08-18 13:55:57 +02:00
Michael Niedermayer
66722b4ba9 Merge commit 'c34a96a5ddfa390ce2a352eca79190766c9056d4' 
* commit 'c34a96a5ddfa390ce2a352eca79190766c9056d4':
  dxa: fix decoding of first I-frame by separating I/P-frame decoding

Conflicts:
	libavcodec/dxa.c

See: 186e47ef6d
Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2013-08-18 12:00:17 +02:00
Paul B Mahol
02eb15a6c1 wavpackenc: do not copy samples if they are not available 
Signed-off-by: Paul B Mahol <onemda@gmail.com>
 2013-08-17 22:25:49 +00:00
Michael Niedermayer
6e4b9b8a2f avcodec: fix compilation without vdpau 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-08-17 22:18:55 +02:00
Michael Niedermayer
a0c6c8e53e Revert "Merge commit of 'vdpau: remove old-style decoders'" 
This reverts commit bf36dc50ea, reversing
changes made to b7fc2693c7.

Conflicts:

	libavcodec/h264.c

Keeping support for the old VDPAU API has been requested by our VDPAU maintainer

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-08-17 22:17:49 +02:00
Michael Niedermayer
0a141b0e49 avcodec/dxa: Support printing picture debug info 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-08-17 15:11:09 +02:00
Janne Grunau
c34a96a5dd dxa: fix decoding of first I-frame by separating I/P-frame decoding 
5ef7c84 broke decoding for the first keyframe due to an unnecessary
check for a reference frame.

CC: libav-stable@libav.org
 2013-08-17 12:55:26 +02:00
Michael Niedermayer
9640ea1da4 dxa: fix support of decoding all frames even in the absence of references 
The case where decoding should only happen for keyframes and afterwards
(CODEC_FLAG2_SHOW_ALL not set) does not fully work neither before nor
after this

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-08-17 11:48:22 +02:00
Michael Niedermayer
186e47ef6d dxa: only fail with an error about reference frames if the reference frame would be used 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-08-17 11:19:20 +02:00
Michael Niedermayer
7a342f97c4 Merge remote-tracking branch 'qatar/master' 
* qatar/master:
  dxa: Make sure the reference frame exists

See: 12eb2fd539
Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2013-08-17 11:19:03 +02:00
Michael Niedermayer
bd71071066 Merge commit 'c59967fa7cc5bc2fa06b36c17d2c207240c06b3e' 
* commit 'c59967fa7cc5bc2fa06b36c17d2c207240c06b3e':
  h261: check the mtype index

Conflicts:
	libavcodec/h261dec.c

The right half of the check is impossible to be true and thus replaced by
an assert()

See: ec3cd74f2d
Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2013-08-17 10:35:51 +02:00
Michael Niedermayer
2c1a215ddb ffv1: update years in header 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-08-17 01:43:30 +02:00
Michael Niedermayer
c8d89be477 ffv1enc: propagate error code from write_extradata() 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-08-17 01:43:30 +02:00
Michael Niedermayer
eeb3fb9e62 ffv1enc: check for malloc failure 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-08-17 01:43:30 +02:00
Michael Niedermayer
29852ffc64 avcodec/dirac_dwt: Remove unused ff_spatial_idwt2() 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-08-16 16:07:29 +02:00
Luca Barbato
5ef7c84a93 dxa: Make sure the reference frame exists 
Reported-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
CC: libav-stable@libav.org
 2013-08-16 14:56:56 +02:00
Luca Barbato
c59967fa7c h261: check the mtype index 
Reported-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
CC: libav-stable@libav.org
 2013-08-16 14:56:49 +02:00
Michael Niedermayer
d7ed473d5c Merge remote-tracking branch 'qatar/master' 
* qatar/master:
  altivec: perform an explicit unaligned load

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2013-08-16 14:21:40 +02:00
Michael Niedermayer
83386a1f62 Merge commit '239f55bf3c966782b781338df284f250393b9ed6' 
* commit '239f55bf3c966782b781338df284f250393b9ed6':
  vp56data: Move all data tables to the .c file

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2013-08-16 13:37:10 +02:00
Michael Niedermayer
669ea5e102 Merge commit 'cb214707a6cb0d3272ec0261af6f1f5d8b7dabc7' 
* commit 'cb214707a6cb0d3272ec0261af6f1f5d8b7dabc7':
  vp56data: Move all shared enum/struct declarations to common header

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2013-08-16 13:19:24 +02:00
Michael Niedermayer
dbcee7cc5c Merge commit '38f64c03301ac66d7b54b3e4bd2bf6454f9fb2d3' 
* commit '38f64c03301ac66d7b54b3e4bd2bf6454f9fb2d3':
  mpeg12decdata.h: Move all tables to the only place they are used

Conflicts:
	libavcodec/mpeg12decdata.h

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2013-08-16 13:13:58 +02:00
Michael Niedermayer
89f4812cda Merge commit 'ec6c1b1d832ec3261cc3faf93a18d7b2a84883c6' 
* commit 'ec6c1b1d832ec3261cc3faf93a18d7b2a84883c6':
  mpeg12decdata: Remove unused #define

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2013-08-16 13:08:12 +02:00
Michael Niedermayer
b7a025092f Merge commit 'c591d4575a6f97fbbe6145304b1ea960e8e81e14' 
* commit 'c591d4575a6f97fbbe6145304b1ea960e8e81e14':
  avcodec: Replace local extern declarations for tables with header #includes

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2013-08-16 13:01:44 +02:00
Michael Niedermayer
7372177a08 Merge commit '060ce0c697e261ca2792a7df30dfd1bae6900a4f' 
* commit '060ce0c697e261ca2792a7df30dfd1bae6900a4f':
  ivi_common: Make some tables only used within the file static

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2013-08-16 12:31:43 +02:00
Michael Niedermayer
15677e7239 Merge commit 'e8c0defe1322f0ff281d9bc5eee91fa1b712b6aa' 
* commit 'e8c0defe1322f0ff281d9bc5eee91fa1b712b6aa':
  8bps: decode 24bit files correctly as rgb32 on bigendian

Conflicts:
	libavcodec/8bps.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2013-08-16 11:43:26 +02:00
Kostya Shishkov
f399e406af altivec: perform an explicit unaligned load 
Implicit vector loads on POWER7 hardware can use the VSX
instruction set instead of classic Altivec/VMX. Let's force
a VMX load in this case.

Signed-off-by: Martin Storsjö <martin@martin.st>
 2013-08-16 10:08:47 +03:00
Diego Biurrun
239f55bf3c vp56data: Move all data tables to the .c file 2013-08-15 14:38:03 +02:00
Diego Biurrun
cb214707a6 vp56data: Move all shared enum/struct declarations to common header 2013-08-15 14:38:03 +02:00
Diego Biurrun
38f64c0330 mpeg12decdata.h: Move all tables to the only place they are used 2013-08-15 14:38:03 +02:00
Diego Biurrun
ec6c1b1d83 mpeg12decdata: Remove unused #define 2013-08-15 14:38:03 +02:00
Diego Biurrun
c591d4575a avcodec: Replace local extern declarations for tables with header #includes 2013-08-15 14:38:03 +02:00
Diego Biurrun
060ce0c697 ivi_common: Make some tables only used within the file static 2013-08-15 14:38:03 +02:00
Michael Niedermayer
23606f27f0 avcodec/ffv1enc: bump minor_version for the chroma_plane fix 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-08-15 13:49:21 +02:00
Michael Niedermayer
1a01147d7a avcodec/ffv1enc: fix chroma_plane for rgb/rgba 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-08-15 13:27:29 +02:00
Michael Niedermayer
c387c45e83 ffv1: fix plane_count at version 1.4 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-08-15 13:03:53 +02:00
Michael Niedermayer
8ec6188263 ffv1dec: support printing information about the global header 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-08-15 12:58:48 +02:00
Janne Grunau
e8c0defe13 8bps: decode 24bit files correctly as rgb32 on bigendian 2013-08-15 11:50:43 +02:00
Michael Niedermayer
bfbe07670b wavpackenc: simplify "sign = ((sample) < 0) ? 1 : 0;" 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-08-14 23:20:25 +02:00
Michael Niedermayer
1a53ddd9a2 avcodec/lzwenc: change asserts to av_asserts 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-08-14 23:15:54 +02:00
Michael Niedermayer
796b20fa1c avcodec/gif: use the whole allocated buffer 
Fixes some gif encoding failures

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-08-14 23:15:54 +02:00
Michael Niedermayer
b4e2e03709 avcodec/lzwenc: Add 1 additional bit of padding for gif 
This fixes issues with gimp reading animated gifs

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-08-14 23:15:54 +02:00
Michael Niedermayer
5dd5985e05 avcodec/gif: move BITSTREAM_WRITER_LE up 
This prevents issues in case any header #includes put_bits.h

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-08-14 23:15:54 +02:00
Michael Niedermayer
dabfa80ce2 avcodec/mjpegdec: print a message when there was just a single field and no frame 
Fixes ticket1915

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-08-14 19:16:38 +02:00
Paul B Mahol
93f4277714 WavPack encoder 
Signed-off-by: Paul B Mahol <onemda@gmail.com>
 2013-08-14 14:04:05 +00:00
Michael Niedermayer
2bac839bd3 Merge commit 'f13fe6020e6a3871f9b0c96b240e58e6ed4fb5d7' 
* commit 'f13fe6020e6a3871f9b0c96b240e58e6ed4fb5d7':
  rtjpeg: Use init_get_bits8

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2013-08-14 11:56:12 +02:00
Michael Niedermayer
d12bc01ec5 Merge commit '62cc7a91080194d9ead162516f779f20931220d9' 
* commit '62cc7a91080194d9ead162516f779f20931220d9':
  rtjpeg: return meaningful error codes

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2013-08-14 11:51:42 +02:00
Michael Niedermayer
8da4305eb5 Merge commit '2df0776c2293efb0ac12c003843ce19332342e01' 
* commit '2df0776c2293efb0ac12c003843ce19332342e01':
  nuv: Use av_fast_realloc

Conflicts:
	libavcodec/nuv.c

This change is not merged, the long ago fixed buffer use after codec_reinit()
was a bug.

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2013-08-14 11:50:40 +02:00
Michael Niedermayer
1dee467d26 Merge commit 'feaaf5f7f0afac7223457f871af2ec9b99eb6cc6' 
* commit 'feaaf5f7f0afac7223457f871af2ec9b99eb6cc6':
  nuv: Reset the frame on resize

Conflicts:
	libavcodec/nuv.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2013-08-14 10:44:55 +02:00
Michael Niedermayer
86fe16a763 Merge commit '075dbc185521f193c98b896cd63be3ec2613df5d' 
* commit '075dbc185521f193c98b896cd63be3ec2613df5d':
  nuv: Pad the lzo outbuf

Conflicts:
	libavcodec/nuv.c

See: 95e1dfee76
See: 266f6eefc6
Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2013-08-14 10:38:11 +02:00
Michael Niedermayer
7ec7d626a1 Merge commit 'aae159a7cc4df7d0521901022b778c9da251c24e' 
* commit 'aae159a7cc4df7d0521901022b778c9da251c24e':
  nuv: Do not ignore lzo decompression failures

Conflicts:
	libavcodec/nuv.c
	tests/ref/fate/nuv-rtjpeg

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2013-08-14 10:10:14 +02:00
Piotr Bandurski
1ee1a3d9f4 avcodec/gsmdec: reject unsupported msn audio modes 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-08-13 23:59:39 +02:00
Paul B Mahol
8a7295beeb tiff: frame multithreading support 
Signed-off-by: Paul B Mahol <onemda@gmail.com>
 2013-08-13 19:29:10 +00:00
Michael Niedermayer
9706401927 avcodec/mpeg12dec: check slice size before trying to decode it 
Fixes assertion failure

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-08-13 19:36:50 +02:00
Thilo Borgmann
6a64b23d93 Update my email address. 2013-08-13 15:45:08 +02:00
Michael Niedermayer
cba9a40d47 avcodec: free priv_data in avcodec_copy_context() 
Fixes memleak
Fixes Ticket2216

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-08-13 15:24:30 +02:00
Michael Niedermayer
ef36ba5e08 avcodec: clarify documentation of avcodec_copy_context() 
Following this is not strictly needed but safes some malloc+free

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-08-13 15:24:30 +02:00
Luca Barbato
f13fe6020e rtjpeg: Use init_get_bits8 
CC:libav-stable@libav.org
 2013-08-13 14:04:55 +02:00
Luca Barbato
62cc7a9108 rtjpeg: return meaningful error codes 2013-08-13 14:04:55 +02:00
Luca Barbato
2df0776c22 nuv: Use av_fast_realloc 
The decompressed buffer can be used after codec_reinit, so it must be
preserved.

Reported-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
CC: libav-stable@libav.org
 2013-08-13 14:04:06 +02:00
Luca Barbato
feaaf5f7f0 nuv: Reset the frame on resize 
Reported-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
CC: libav-stable@libav.org
 2013-08-13 13:09:33 +02:00
Luca Barbato
075dbc1855 nuv: Pad the lzo outbuf 
And properly update the buf_size with the correct size.

Reported-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
CC: libav-stable@libav.org
 2013-08-13 13:09:33 +02:00
Luca Barbato
aae159a7cc nuv: Do not ignore lzo decompression failures 
Update the fate reference since the last broken frame is not decoded
anymore.

Reported-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
CC: libav-stable@libav.org
 2013-08-13 13:09:22 +02:00
Ian Taylor
46dee21a32 png: allow encoding 16-bit grayscale 
Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
 2013-08-13 06:05:44 +02:00
Thilo Borgmann
bb4e1b4cf9 avcodec/mjpegdec: Read EXIF metadata in JPEG input. 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-08-13 00:30:34 +02:00
Thilo Borgmann
ad0f7574ef avcodec: Add EXIF metadata parser to libavcodec. 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-08-13 00:30:20 +02:00
Thilo Borgmann
b7ba7cbd6e avcodec/tiff: Refactor TIFF tag related functions to share the code. 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-08-13 00:30:02 +02:00
Michael Niedermayer
5347de881b libavcodec/xsubenc.c: Fix duplicate words 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-08-12 19:40:29 +02:00
Michael Niedermayer
ad26aa3623 libavcodec/rv40.c: Fix duplicate words 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-08-12 19:40:29 +02:00
Michael Niedermayer
c6325e50dd libavcodec/mpegvideo.h: Fix duplicate words 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-08-12 19:40:29 +02:00
Michael Niedermayer
1e6816dcda libavcodec/lpc.h: Fix duplicate words 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-08-12 19:40:29 +02:00
Michael Niedermayer
e458fd6cf9 libavcodec/dv.c: Fix duplicate words 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-08-12 19:40:29 +02:00
Michael Niedermayer
805fbbefb3 libavcodec/bintext.h: Fix duplicate words 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-08-12 19:40:29 +02:00
Michael Niedermayer
c77c5f6c9f libavcodec/bink.c: Fix duplicate words 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-08-12 19:40:29 +02:00
Michael Niedermayer
9da6e742f4 libavcodec/avcodec.h: Fix duplicate words 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-08-12 19:40:29 +02:00
Michael Niedermayer
f10462377d libavcodec/ac3tab.c: Fix duplicate words 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-08-12 19:40:29 +02:00
Michael Niedermayer
7fabf3a4b7 libavcodec/ac3enc_template.c: Fix duplicate words 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-08-12 19:40:29 +02:00
Michael Niedermayer
c103d5f538 Merge remote-tracking branch 'qatar/master' 
* qatar/master:
  wmall: use AVFrame API properly

Conflicts:
	libavcodec/wmalosslessdec.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2013-08-12 10:13:56 +02:00
Thilo Borgmann
f18ccb529f Fix wrong use of "an" in some comments. 2013-08-12 03:27:26 +02:00
Michael Niedermayer
98fd8a7848 avcodec: Remove ff_packet_free_side_data, use av_packet_free_side_data 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-08-12 00:13:21 +02:00
Hendrik Leppkes
3ca5df36a5 wmall: use AVFrame API properly 
This fixes a bug with non-refcounted callers resulting in invalid memory access.

Signed-off-by: Anton Khirnov <anton@khirnov.net>
 2013-08-11 21:13:56 +02:00
Reimar Döffinger
d404fe35b2 Make new VDPAU easier to use by adding context to callback. 
Using VDPAU correctly means checking for preemption
and possibly regenerating the context all the time.
With the current API there is no context or other
user-defined pointer and thus this in not possible
during decoding unless using some hack like global
variables.
The need to reinitialize both surfaces and even function
pointers makes handling preemption even more difficult.
This patch introduces a new render2 function that gets
both the AVCodecContext and AVFrame in addition,
in both the user can store additional opaque data.
This allows even advanced approaches like keeping a
"generation counter" for the surfaces so they can be
regenerated on the fly and efficiently.
In addition, the function has a return value that will
be passed through all the way instead of being silently
ignored as for the current render function.
Unfortunately the HWAccel API has no way of providing
API/ABI compatibility, so a currently disallowed
state (render pointer being NULL) is used to extend it.

Signed-off-by: Reimar Döffinger <Reimar.Doeffinger@gmx.de>
 2013-08-11 20:16:57 +02:00
Reimar Döffinger
af05edc658 vdpau: Add an allocation function for AVVDPAUContext. 
Signed-off-by: Reimar Döffinger <Reimar.Doeffinger@gmx.de>
 2013-08-11 19:31:46 +02:00
Reimar Döffinger
d87f9da53c vdpau_internal.h: Add missing include for FF_API_BUFS_VDPAU. 
Signed-off-by: Reimar Döffinger <Reimar.Doeffinger@gmx.de>
 2013-08-11 19:30:51 +02:00
Reimar Döffinger
49cf36f4e3 sanm: fix undefined behaviour on big-endian. 
A variable with post-increment may only appear
once in a statement.

Signed-off-by: Reimar Döffinger <Reimar.Doeffinger@gmx.de>
 2013-08-11 19:30:51 +02:00
Michael Niedermayer
61e0e80999 tiff: continue parsing on non fatal errors 
Reviewed-by: Thilo Borgmann <thilo.borgmann@mail.de>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-08-11 18:11:36 +02:00
Michael Niedermayer
8e119a22c4 mpeg4videodec: Parse newpred headers 
This is untested due to lack of a non broken file using new pred

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-08-11 17:35:30 +02:00
Michael Niedermayer
06137a496b mpeg4videodec: check resolution marker bits 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-08-11 17:34:29 +02:00
Michael Niedermayer
b905a7137a avcodec/avpacket: Fix memory allocation failure check 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-08-11 10:56:07 +02:00
Michael Niedermayer
67a580f423 Merge commit '5a9a9d4a2abefa63d9a898ce26715453c569e89d' 
* commit '5a9a9d4a2abefa63d9a898ce26715453c569e89d':
  lavc: Add refcounted api to AVPacket

Conflicts:
	libavcodec/avpacket.c
	libavcodec/version.h

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2013-08-11 10:45:13 +02:00
Michael Niedermayer
921c1d4c95 Merge commit 'c1076d8479a6c0ee2e0c4b0e2151df5b0228438e' 
* commit 'c1076d8479a6c0ee2e0c4b0e2151df5b0228438e':
  h264: check one context_init() allocation

Conflicts:
	libavcodec/h264.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2013-08-11 10:35:44 +02:00
Michael Niedermayer
d2d8e259fd Merge commit '5eb488bfa835f2902a31ba99d57c16ae36c4f598' 
* commit '5eb488bfa835f2902a31ba99d57c16ae36c4f598':
  h264: use explicit variable names for *_field_flag

Conflicts:
	libavcodec/h264.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2013-08-11 10:28:49 +02:00
Michael Niedermayer
019eb2c77b svq3: Fix ff_h264_check_intra_pred_mode() return code check 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-08-11 10:22:51 +02:00
Michael Niedermayer
e0b45ca730 Merge commit 'b3dc260e7fa6f3f852dd5cb7d86763c4b5736714' 
* commit 'b3dc260e7fa6f3f852dd5cb7d86763c4b5736714':
  h264: return meaningful values

Conflicts:
	libavcodec/h264.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2013-08-11 10:08:48 +02:00
Luca Barbato
5a9a9d4a2a lavc: Add refcounted api to AVPacket 
Provide a clean way to manipulate packets.
 2013-08-10 13:41:35 +02:00
Vittorio Giovara
c1076d8479 h264: check one context_init() allocation 
Signed-off-by: Anton Khirnov <anton@khirnov.net>
 2013-08-10 13:36:38 +02:00
Vittorio Giovara
5eb488bfa8 h264: use explicit variable names for *_field_flag 
Signed-off-by: Anton Khirnov <anton@khirnov.net>
 2013-08-10 13:36:25 +02:00
Vittorio Giovara
b3dc260e7f h264: return meaningful values 
Signed-off-by: Anton Khirnov <anton@khirnov.net>
 2013-08-10 13:28:51 +02:00
Michael Niedermayer
b37ff488b8 Merge remote-tracking branch 'qatar/master' 
* qatar/master:
  libavutil: Make avpriv_open a library-internal function on msvcrt

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2013-08-10 10:51:03 +02:00
Reimar Döffinger
d4db7c334b Integrate accessors.h header into internal.h 
I have no idea why I added a separate header,
I think there is no good reason for it.

Signed-off-by: Reimar Döffinger <Reimar.Doeffinger@gmx.de>
 2013-08-10 07:56:42 +02:00
Martin Storsjö
e743e7ae6e libavutil: Make avpriv_open a library-internal function on msvcrt 
Add one copy of the function into each of the libraries, similarly
to what we do for log2_tab. When using static libs, only one
copy of the file_open.o object file gets included, while when
using shared libraries, each of them get a copy of its own.

This fixes DLL builds with a statically linked C runtime, where
each DLL effectively has got its own instance of the C runtime,
where file descriptors can't be shared across runtimes.

On systems not using msvcrt, the function is not duplicated.

Signed-off-by: Martin Storsjö <martin@martin.st>
 2013-08-10 00:53:33 +03:00
Michael Niedermayer
db8578a809 avcodec/raw: gbrp support 
Fixes 2nd half of Ticket2274

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-08-09 23:02:48 +02:00
Michael Niedermayer
200170e8c0 avcodec/tiff: remove redundant check 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-08-09 14:58:07 +02:00
Michael Niedermayer
a9553e8f37 avcodec/tiff: avoid seek back on reading tags 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-08-09 14:53:13 +02:00
Reimar Döffinger
a48979d715 Reduce MAKE_ACCESSORS code duplication via a new header. 
Signed-off-by: Reimar Döffinger <Reimar.Doeffinger@gmx.de>
 2013-08-08 20:32:40 +02:00
Michael Niedermayer
9386f334af avcodec/bitstream: Dont try to free buffers for static VLCs 
Such buffers are not malloced thus freeing would be bad.
Note though this condition never could have happened so this
is more for correctness sake and not a true bugfix

Fixes CID1061047

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-08-08 15:05:48 +02:00
Michael Niedermayer
e1a5ee25e0 Merge remote-tracking branch 'qatar/master' 
* qatar/master:
  arm: Add assembly version of h264_find_start_code_candidate

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2013-08-08 12:52:35 +02:00
Michael Niedermayer
c0f2ad3dbd Merge commit '218d6844b37d339ffbf2044ad07d8be7767e2734' 
* commit '218d6844b37d339ffbf2044ad07d8be7767e2734':
  h264dsp: Factorize code into a new function, h264_find_start_code_candidate

Conflicts:
	libavcodec/h264_parser.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2013-08-08 12:47:05 +02:00
Michael Niedermayer
50b7ce1257 Merge commit '7a82022ee2f9b1fad991ace0936901e7419444be' 
* commit '7a82022ee2f9b1fad991ace0936901e7419444be':
  h264_parser: Initialize the h264dsp context in the parser as well

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2013-08-08 12:29:35 +02:00
Michael Niedermayer
69ea65b46f Merge commit '3e5898782dce60334ab294821ca00b19c648cf66' 
* commit '3e5898782dce60334ab294821ca00b19c648cf66':
  Voxware MetaSound decoder

Conflicts:
	Changelog
	libavcodec/Makefile
	libavcodec/version.h

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2013-08-08 12:11:33 +02:00
Ben Avison
45e10e5c8d arm: Add assembly version of h264_find_start_code_candidate 
Before          After
               Mean   StdDev   Mean   StdDev  Change
This function   508.8 23.4      185.4  9.0    +174.4%
Overall        3068.5 31.7     2752.1 29.4     +11.5%

In combination with the preceding patch:
                Before          After
                Mean   StdDev   Mean   StdDev  Change
Overall         2925.6 26.2     2752.1 29.4     +6.3%

Signed-off-by: Martin Storsjö <martin@martin.st>
 2013-08-08 12:08:34 +03:00
Ben Avison
218d6844b3 h264dsp: Factorize code into a new function, h264_find_start_code_candidate 
This performs the start code search which was previously part of
h264_find_frame_end() - the most CPU intensive part of the function.

By itself, this results in a performance regression:
              Before          After
              Mean   StdDev   Mean   StdDev  Change
Overall time  2925.6 26.2     3068.5 31.7    -4.7%

but this can more than be made up for by platform-optimised
implementations of the function.

Signed-off-by: Martin Storsjö <martin@martin.st>
 2013-08-08 12:08:30 +03:00
Ben Avison
7a82022ee2 h264_parser: Initialize the h264dsp context in the parser as well 
Each AVStream struct for an H.264 elementary stream actually has two
copies of the H264DSPContext struct (and in fact all the other members
of H264Context as well):

((H264Context *) ((AVStream *)st)->codec->priv_data)->h264dsp
((H264Context *) ((AVStream *)st)->parser->priv_data)->h264dsp

but only the first of these was actually being initialised. This
prevented the addition of platform-specific implementations of
parser-related functions.

Signed-off-by: Martin Storsjö <martin@martin.st>
 2013-08-08 12:08:28 +03:00
Kostya Shishkov
3e5898782d Voxware MetaSound decoder 2013-08-08 10:52:44 +02:00
Michael Niedermayer
1b2a5817fc Merge commit '22c879057ead189c0f59241cb9eeb926381e3299' 
* commit '22c879057ead189c0f59241cb9eeb926381e3299':
  mpegvideo_enc: drop outdated copy_picture_attributes() in favour of a modern av_frame_copy_props()

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2013-08-08 10:49:23 +02:00
Rémi Denis-Courmont
fee9db1fdf libavcodec: use avpriv_open() 
Signed-off-by: Anton Khirnov <anton@khirnov.net>
 2013-08-07 21:13:12 +02:00
Vittorio Giovara
22c879057e mpegvideo_enc: drop outdated copy_picture_attributes() in favour of a modern av_frame_copy_props() 
Signed-off-by: Anton Khirnov <anton@khirnov.net>
 2013-08-07 20:48:15 +02:00
Michael Niedermayer
2960576378 avcodec/g2meet: fix src pointer checks in kempf_decode_tile() 
Fixes Ticket2842

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-08-07 16:28:28 +02:00
Michael Niedermayer
5cd57e8758 avcodec/jpeg2000dec: check sample sepration for validity 
Fixes division by 0
Fixes Ticket2841

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-08-07 15:09:35 +02:00
Michael Niedermayer
e4eab2d9bd Merge remote-tracking branch 'qatar/master' 
* qatar/master:
  deprecate AV_CODEC_ID_VOXWARE and introduce AV_CODEC_ID_METASOUND instead

Conflicts:
	libavcodec/avcodec.h
	libavcodec/codec_desc.c
	libavcodec/version.h

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2013-08-07 12:14:39 +02:00
Kostya Shishkov
f544c58636 deprecate AV_CODEC_ID_VOXWARE and introduce AV_CODEC_ID_METASOUND instead 
Voxware is the name of company, it has produced several audio codecs e.g.
MetaVoice family and MetaSound.
 2013-08-07 10:56:18 +02:00
Michael Niedermayer
aa24729c21 Merge remote-tracking branch 'qatar/master' 
* qatar/master:
  pcm_bluray: Return AVERROR_INVALIDDATA instead of -1 on header errors

Conflicts:
	libavcodec/pcm-mpeg.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2013-08-06 19:40:50 +02:00
Michael Niedermayer
83db013a06 Merge remote-tracking branch 'qatar/master' 
* qatar/master:
  avcodec/options: Drop deprecation warning suppression macros

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2013-08-06 16:48:31 +02:00
Michael Niedermayer
7d03e60c12 Merge commit '86f4c59bd676672040b89d8fea4c9e3b59bfe7ab' 
* commit '86f4c59bd676672040b89d8fea4c9e3b59bfe7ab':
  twinvq: Split VQF-specific part from common TwinVQ decoder core

Conflicts:
	libavcodec/Makefile
	libavcodec/twinvq.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2013-08-06 16:37:08 +02:00
Michael Niedermayer
a97f749990 Merge commit '4d8d16b596c63de85e52488734338fbb41238058' 
* commit '4d8d16b596c63de85e52488734338fbb41238058':
  twinvq: Prefix enums and defines shared with VoxWare MetaSound

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2013-08-06 16:29:35 +02:00
Michael Niedermayer
9648c8e57b Merge commit 'bc909626b0a3c107625f2cb4c85479d18de422a8' 
* commit 'bc909626b0a3c107625f2cb4c85479d18de422a8':
  twinvq: move all bitstream reading into single place

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2013-08-06 16:24:08 +02:00
Michael Niedermayer
0df55e1ba8 Merge commit 'a22ae9f0c579793f411e2bd7a8db557091a3a4ae' 
* commit 'a22ae9f0c579793f411e2bd7a8db557091a3a4ae':
  mpegts: Remove one 64-bit integer modulus operation per packet

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2013-08-06 16:23:32 +02:00
Michael Niedermayer
91062ddef1 Merge commit '43bacd5b7d3d265a77cd29d8abb131057796aecc' 
* commit '43bacd5b7d3d265a77cd29d8abb131057796aecc':
  vc1: check mb_height validity.

See: b5f4836f8c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2013-08-06 16:07:37 +02:00
Michael Niedermayer
f606c6e92c Merge commit '090cd0631140ac1a3a795d2adfac5dbf5e381aa2' 
* commit '090cd0631140ac1a3a795d2adfac5dbf5e381aa2':
  vc1: check the source buffer in vc1_mc functions

Conflicts:
	libavcodec/vc1dec.c

See: 3a04c18d89
Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2013-08-06 15:57:35 +02:00
Michael Niedermayer
560e9365b6 Merge commit 'bc54c2ae3ca6abd225dc331eafc12108513158de' 
* commit 'bc54c2ae3ca6abd225dc331eafc12108513158de':
  libx264: add shortcut for the bluray compatibility option

Conflicts:
	doc/encoders.texi

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2013-08-06 15:26:04 +02:00
Michael Niedermayer
318d7a9638 avcodec/vdpau: include attributes.h, needed for attribute_deprecated 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-08-06 14:49:03 +02:00
Michael Niedermayer
66056f74a1 avcodec/vdpau.h: define FF_API_BUFS_VDPAU if its not defined 
Similar to 50fb8c1114

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-08-06 14:48:54 +02:00
Michael Niedermayer
9547e3eef3 Merge commit 'f824535a4a79c260b59d3178b8d958217caffd78' 
* commit 'f824535a4a79c260b59d3178b8d958217caffd78':
  vdpau: deprecate bitstream buffers within the hardware context

Conflicts:
	libavcodec/version.h

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2013-08-06 14:30:49 +02:00
Michael Niedermayer
c3b2902320 Merge commit '2852740e23f91d6775714d7cc29b9a73e1111ce0' 
* commit '2852740e23f91d6775714d7cc29b9a73e1111ce0':
  vdpau: store picture data in picture's rather than codec's context

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2013-08-06 14:25:26 +02:00
Michael Niedermayer
50fb8c1114 avcodec/vdpau.h: define FF_API_CAP_VDPAU if its not defined 
Prevent build failure for applicatins using the old API
This could be replaced be a include of version.h but some applications
would then need extern C wrapers

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-08-06 14:15:17 +02:00
Michael Niedermayer
3b805dcaa9 Merge commit '549294fbbe1c00fee37dc4d3f291b98945e11094' 
* commit '549294fbbe1c00fee37dc4d3f291b98945e11094':
  vdpau: deprecate VDPAU codec capability

Conflicts:
	libavcodec/version.h

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2013-08-06 13:54:05 +02:00
Michael Niedermayer
bf36dc50ea Merge commit '578ea75a9e4ac56e0bbbbe668700be756aa699f8' 
* commit '578ea75a9e4ac56e0bbbbe668700be756aa699f8':
  vdpau: remove old-style decoders

Conflicts:
	libavcodec/allcodecs.c
	libavcodec/h263dec.c
	libavcodec/h264.c
	libavcodec/mpeg12dec.c
	libavcodec/mpeg4videodec.c
	libavcodec/vc1dec.c
	libavcodec/vdpau.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2013-08-06 13:24:22 +02:00
Christian Schmidt
1c6d2bb9a9 pcm_bluray: Return AVERROR_INVALIDDATA instead of -1 on header errors 
Signed-off-by: Diego Biurrun <diego@biurrun.de>
 2013-08-06 13:19:29 +02:00
Diego Biurrun
0ba4ea312b avcodec/options: Drop deprecation warning suppression macros 
The options table is used in tools built by the host compiler and the
deprecation macros pull in bits that are not safe to use if host and
target compiler differ.
 2013-08-06 03:05:03 +02:00
Carl Eugen Hoyos
4c15f3491f Set bits_per_raw_sample when decoding pnm. 2013-08-06 00:26:21 +02:00
Kostya Shishkov
86f4c59bd6 twinvq: Split VQF-specific part from common TwinVQ decoder core 
Signed-off-by: Diego Biurrun <diego@biurrun.de>
 2013-08-05 20:59:23 +02:00
Diego Biurrun
4d8d16b596 twinvq: Prefix enums and defines shared with VoxWare MetaSound 2013-08-05 20:19:11 +02:00
Kostya Shishkov
bc909626b0 twinvq: move all bitstream reading into single place 
This is required for the future addition of VoxWare MetaSound decoder, for its
functions are mostly the same but bitstream reader is completely different
and bitstream format is slightly different too.

Signed-off-by: Diego Biurrun <diego@biurrun.de>
 2013-08-05 19:37:47 +02:00
Ben Avison
a22ae9f0c5 mpegts: Remove one 64-bit integer modulus operation per packet 
The common case of the pointer having increased by one packet (which results
in no change to the modulus) can be detected with a 64-bit subtraction,
which is far cheaper than a division on many platforms.

           Before          After
           Mean   StdDev   Mean   StdDev  Change
Divisions   248.3  8.8      51.5   7.4    +381.7%
Overall    2773.2 25.6     2372.5 43.1     +16.9%

Signed-off-by: Martin Storsjö <martin@martin.st>
 2013-08-05 19:25:55 +03:00
Luca Barbato
43bacd5b7d vc1: check mb_height validity. 
Reported-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
CC: libav-stable@libav.org
 2013-08-05 16:24:13 +02:00
Luca Barbato
090cd06311 vc1: check the source buffer in vc1_mc functions 
Reported-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
CC: libav-stable@libav.org
 2013-08-05 16:24:13 +02:00
Luca Barbato
9991298f2c bink: Bound check the quantization matrix. 
Reported-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
CC: libav-stable@libav.org
 2013-08-05 16:24:13 +02:00
Luca Barbato
bc54c2ae3c libx264: add shortcut for the bluray compatibility option 
As for intra-refresh it is just a commodity.
 2013-08-05 16:13:35 +02:00
Timothy Gu
3217a706e2 libxvid: Reduce the size of an array 
It is not possible to have a plugin[] array with 5 or more elements.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-08-05 15:11:17 +02:00
Michael Niedermayer
1ccc2157ff avcodec/libxvid: Partially check plugins array size with assert 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-08-05 15:06:04 +02:00
Michael Niedermayer
412df0a52f avcodec/libxvid: set lumi_aq for lumimasking 
Simplifies check and should fix lumi+vari warning

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-08-05 15:06:04 +02:00
Rémi Denis-Courmont
f824535a4a vdpau: deprecate bitstream buffers within the hardware context 
The bitstream buffers are now private and freed by libavcodec. For
backward compatibility, the hold bitstream buffer pointer is left NULL
(applications were supposed to av_freep() it).

Signed-off-by: Anton Khirnov <anton@khirnov.net>
 2013-08-05 11:21:36 +02:00
Rémi Denis-Courmont
2852740e23 vdpau: store picture data in picture's rather than codec's context 
Signed-off-by: Anton Khirnov <anton@khirnov.net>
 2013-08-05 11:20:41 +02:00
Rémi Denis-Courmont
549294fbbe vdpau: deprecate VDPAU codec capability 
Signed-off-by: Anton Khirnov <anton@khirnov.net>
 2013-08-05 11:20:32 +02:00
Rémi Denis-Courmont
578ea75a9e vdpau: remove old-style decoders 
Signed-off-by: Anton Khirnov <anton@khirnov.net>
 2013-08-05 11:15:49 +02:00
Michael Niedermayer
22458ccbcc avcodec/tta: use init_get_bits8() 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-08-05 10:15:03 +02:00
Michael Niedermayer
263da1a8f7 avcodec/eatgq: use init_get_bits8() 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-08-05 10:14:14 +02:00
Michael Niedermayer
5dff269998 avcodec/diracdec: use init_get_bits8() 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-08-05 10:13:48 +02:00
Michael Niedermayer
6ed1aa4f85 avcodec/ra144dec: use init_get_bits8() 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-08-05 10:13:21 +02:00
Michael Niedermayer
d6c36fba0b Merge commit 'a10c4ce24bd4a0dd557d5849aa53a0cc74677808' 
* commit 'a10c4ce24bd4a0dd557d5849aa53a0cc74677808':
  aac: Forward errors properly in aac_decode_frame_int

Conflicts:
	libavcodec/aacdec.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2013-08-05 09:52:06 +02:00
Michael Niedermayer
48af87819a Merge commit '71953ebcf94fe4ef316cdad1f276089205dd1d65' 
* commit '71953ebcf94fe4ef316cdad1f276089205dd1d65':
  aac: Check init_get_bits return value

Conflicts:
	libavcodec/aacdec.c

See: 73abc3a634

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2013-08-05 09:46:04 +02:00
Michael Niedermayer
6bbcae2c16 avcodec/fft: Fix "warning: unused variable" 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-08-04 22:52:10 +02:00
Luca Barbato
a10c4ce24b aac: Forward errors properly in aac_decode_frame_int 
Incidentally also remove a warning.
 2013-08-04 16:05:36 +02:00
Luca Barbato
71953ebcf9 aac: Check init_get_bits return value 
Some code paths can call it with invalid length.

CC: libav-stable@libav.org
 2013-08-04 16:05:36 +02:00
Nedeljko Babic
18d7074b4e libavcodec: Implementation of 32 bit fixed point FFT 
Iterative implementation of 32 bit fixed point split-radix FFT.
Max FFT that can be calculated currently is 2^12.

Signed-off-by: Nedeljko Babic <nbabic@mips.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-08-04 14:01:41 +02:00
Carl Eugen Hoyos
34d48dac25 avcodec/pnmdec: support more pnm files 
Fixes Ticket1897

Some hunks that have become unneeded due to previous changes removed by the commiter.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-08-03 15:00:20 +02:00
Michael Niedermayer
62738157dd pnmdec: always output native pixel format 
This simplifies the code

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-08-03 15:00:15 +02:00
Michael Niedermayer
82fdfe8e51 Merge commit 'a8b19271c3b40ac3c3dc769fe248887acf14ba5a' 
* commit 'a8b19271c3b40ac3c3dc769fe248887acf14ba5a':
  avcodec: Add output_picture_number to AVCodecParserContext

Conflicts:
	doc/APIchanges
	libavcodec/version.h

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2013-08-03 10:48:11 +02:00
Michael Niedermayer
1607a98545 avcodec/mlp: Fix bugs in libavs warning fixes 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-08-03 10:27:42 +02:00
Michael Niedermayer
20be5e0a0e Merge commit '7950e519bb094897f957b9a9531cc60ba46cbc91' 
* commit '7950e519bb094897f957b9a9531cc60ba46cbc91':
  Disable deprecation warnings for cases where a replacement is available

Conflicts:
	libavcodec/avpacket.c
	libavcodec/pthread.c
	libavcodec/utils.c
	libavdevice/v4l2.c
	libavfilter/avfiltergraph.c
	libavfilter/buffersrc.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2013-08-03 10:08:30 +02:00
Michael Niedermayer
a8e963835a Merge commit 'b5a138652ff8a5b987d3e1191e67fd9f6575527e' 
* commit 'b5a138652ff8a5b987d3e1191e67fd9f6575527e':
  Give less generic names to global library option arrays

Conflicts:
	libavcodec/options_table.h
	libavfilter/avfilter.c
	libavformat/options_table.h
	libswscale/options.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2013-08-03 09:16:36 +02:00
Michael Niedermayer
7cd13f618c Merge commit '0d8b943d204bd16fcf2f4a59c742e65a401dd3d0' 
* commit '0d8b943d204bd16fcf2f4a59c742e65a401dd3d0':
  h264_sei: Return meaningful values

Conflicts:
	libavcodec/h264_sei.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2013-08-03 08:54:54 +02:00
Michael Niedermayer
bdccfc3fc3 Merge remote-tracking branch 'cehoyos/master' 
* cehoyos/master:
  Forward interlaced field information from mov to ffv1 decoder.
  Do not suggest to use gas-preprocessor if using it would break compilation.

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2013-08-03 00:45:08 +02:00
Tim.Nicholson
ae4c912bce Forward interlaced field information from mov to ffv1 decoder. 
Only read the information for old ffv1, level/version 3 saves
the information in the bitstream.
Fixes a part of ticket #2190.

Signed-off-by: Carl Eugen Hoyos <cehoyos@ag.or.at>
 2013-08-02 23:31:40 +02:00
Michael Niedermayer
154c8bf60b avcodec/mdec: make block_index static const 2013-08-02 23:12:26 +02:00
Michael Niedermayer
f19a23bd4f avcodec/mjpeg: make 2 outcommented tables static 2013-08-02 23:11:58 +02:00
Michael Niedermayer
b984c727f5 avcodec/dxtory: make def_lru[8] static 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-08-02 23:11:31 +02:00
Michael Niedermayer
04c50cb3a0 avcodec/dnxhdenc: make header_prefix static const 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-08-02 23:10:42 +02:00
Yusuke Nakamura
a8b19271c3 avcodec: Add output_picture_number to AVCodecParserContext 
Set output_picture_number in H.264 parser.

Signed-off-by: Diego Biurrun <diego@biurrun.de>
 2013-08-02 20:59:45 +02:00
Diego Biurrun
7950e519bb Disable deprecation warnings for cases where a replacement is available 2013-08-02 19:19:02 +02:00
Diego Biurrun
b5a138652f Give less generic names to global library option arrays 2013-08-02 19:19:02 +02:00
Paul B Mahol
bc2187cfdb ttaenc: fix packet size 
Signed-off-by: Paul B Mahol <onemda@gmail.com>
 2013-08-02 16:45:58 +00:00
Vittorio Giovara
0d8b943d20 h264_sei: Return meaningful values 
Signed-off-by: Diego Biurrun <diego@biurrun.de>
 2013-08-02 18:19:40 +02:00
Michael Niedermayer
2ae5ac78d8 Merge remote-tracking branch 'qatar/master' 
* qatar/master:
  h264_sei: K&R formatting cosmetics

Conflicts:
	libavcodec/h264_sei.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2013-08-02 12:37:37 +02:00
Michael Niedermayer
da4cd61502 Merge commit '4c7fd58f8ae729b964b6859eace5ab9a55ce3c8c' 
* commit '4c7fd58f8ae729b964b6859eace5ab9a55ce3c8c':
  h264_sei: Remove pointless old comment
  twinvq: Add proper twinvq prefixes to identifiers

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2013-08-02 12:23:52 +02:00
Michael Niedermayer
bff371e34c jpeg2000dec: simplify jpeg2000_read_bitstream_packets() 
23 lines less
less error prone as theres no more need to update *_size on every read

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-08-02 03:55:07 +02:00
Michael Niedermayer
5936d98244 avcodec/wmaenc: change commented assert to av_assert 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-08-02 03:54:59 +02:00
Timothy Gu
b3f858b829 libxvid: cosmetics: Realign the code 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-08-02 03:21:09 +02:00
Vittorio Giovara
b18412171f h264_sei: K&R formatting cosmetics 
Signed-off-by: Diego Biurrun <diego@biurrun.de>
 2013-08-01 13:26:07 +02:00
Diego Biurrun
4c7fd58f8a h264_sei: Remove pointless old comment 2013-08-01 13:26:07 +02:00
Diego Biurrun
9ea24e927e twinvq: Add proper twinvq prefixes to identifiers 2013-08-01 12:44:05 +02:00
Paul B Mahol
69fe25cdca lclenc: remove unused code 
Signed-off-by: Paul B Mahol <onemda@gmail.com>
 2013-07-31 20:01:43 +00:00
Paul B Mahol
fe37551249 sunrastenc: do not set avctx->coded_frame 
Signed-off-by: Paul B Mahol <onemda@gmail.com>
 2013-07-31 20:01:43 +00:00
Paul B Mahol
678431d3f2 jv: make code independent of sizeof(AVFrame) 
Signed-off-by: Paul B Mahol <onemda@gmail.com>
 2013-07-31 20:01:42 +00:00
Paul B Mahol
ff1c13b133 mss3: make code independent of sizeof(AVFrame) 
Signed-off-by: Paul B Mahol <onemda@gmail.com>
 2013-07-31 20:01:42 +00:00
Paul B Mahol
02fe531afe mss2: make code independent of sizeof(AVFrame) 
Signed-off-by: Paul B Mahol <onemda@gmail.com>
 2013-07-31 20:01:42 +00:00
Paul B Mahol
451b2ca1b4 indeo2: make code independent of sizeof(AVFrame) 
Signed-off-by: Paul B Mahol <onemda@gmail.com>
 2013-07-31 20:01:42 +00:00
Paul B Mahol
76e27b1d05 smacker: make code independent of sizeof(AVFrame) 
Signed-off-by: Paul B Mahol <onemda@gmail.com>
 2013-07-31 20:01:42 +00:00
Timothy Gu
3b3c1ed076 libxvid: Add SSIM displaying through a libxvidcore plugin 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-07-31 12:41:27 +02:00
Timothy Gu
ccb212b6c3 libxvid: add working lumimasking and variance AQ 
The old implementation is unusable due to change in the Xvid API.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-07-31 11:57:52 +02:00
Romain Beauxis
38536e5927 Support for shine 3.0.0 2013-07-30 21:12:34 +00:00
Michael Niedermayer
121fc05b4d avcodec/get_bits: place volatile at the right spot 
Should fix Ticket2825

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-07-30 20:55:54 +02:00
Michael Niedermayer
43411f416f avcodec/get_bits: init_state is used for thread sync, make it volatile 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-07-30 20:38:19 +02:00
Michael Niedermayer
000f8bcd03 Merge remote-tracking branch 'qatar/master' 
* qatar/master:
  Replace remaining obsolete PIX_FMT names with AV_PIX_FMT equivalents

Conflicts:
	libavcodec/g2meet.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2013-07-30 12:03:12 +02:00
Michael Niedermayer
947f2d4d34 Merge commit '55c4cba2a7037161ea56b2d55b347c8381df7f1e' 
* commit '55c4cba2a7037161ea56b2d55b347c8381df7f1e':
  huffyuvenc: BGRA support

Conflicts:
	libavcodec/huffyuvenc.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2013-07-30 09:50:26 +02:00
Diego Biurrun
78b4bfdb84 Replace remaining obsolete PIX_FMT names with AV_PIX_FMT equivalents 2013-07-29 23:46:51 +02:00
Michael Niedermayer
3cd8aaa2b2 avcodec/kmvc: fix MV checks 
Fixes Ticket2813
Fixes regression since 70b5583

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-07-29 20:58:20 +02:00
Michael Niedermayer
55c4cba2a7 huffyuvenc: BGRA support 
Bug-Id: 452

Signed-off-by: Diego Biurrun <diego@biurrun.de>
 2013-07-29 18:21:05 +02:00
Carl Eugen Hoyos
f2118d44c9 Fix compilation with --disable-everything --enable-shared. 
Compilation with --disable-everything --enable-shared failed
on systems with VAAPI support with the following undefined
symbol in libavcodec/vaapi.o:
libavcodec/libavcodec.so: undefined reference to `ff_mpeg_draw_horiz_band'
 2013-07-29 17:52:40 +02:00
Michael Niedermayer
f80ccf074a avcodec/ff_init_vlc_sparse: use a local array for static vlcs avoiding malloc() 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-07-29 16:48:41 +02:00
Michael Niedermayer
6af8326354 avcodec/ff_init_vlc_sparse: use a spinlock for thread sync 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-07-29 16:48:41 +02:00
Michael Niedermayer
a9903f7ec1 Revert "bitstream: make vlc init of static tables thread safe." 
This reverts commit 4b6869d6e0.

Conflicts:

	libavcodec/bitstream.c

This code can cause assertion failures on artificial OOM situations
It will be replaced by a solution that doesnt have this issue in the
following commits.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-07-29 16:48:41 +02:00
Paul B Mahol
2786ac777d zmbv: use av_image_copy_plane() 
Signed-off-by: Paul B Mahol <onemda@gmail.com>
 2013-07-29 14:45:02 +00:00
Michael Niedermayer
6561aae8a9 Merge commit '3ca1dd2502a860989ee5289316af6b9816cee78f' 
* commit '3ca1dd2502a860989ee5289316af6b9816cee78f':
  xl: Make sure the width is valid

Conflicts:
	libavcodec/xl.c

See: 94b42da696
Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2013-07-29 12:09:38 +02:00
Michael Niedermayer
0c6f382e85 Merge commit '62b1e3b1031e901105d78e831120de8e4c3e0013' 
* commit '62b1e3b1031e901105d78e831120de8e4c3e0013':
  aasc: Check minimum buffer size

Conflicts:
	libavcodec/aasc.c

See: e1631f8ebe
See: 8a57ca5c6a
Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2013-07-29 11:46:28 +02:00
Michael Niedermayer
5f312139df Merge commit '45ee556d51ef04d79d52bf6b0b7f28a4d231cb0c' 
* commit '45ee556d51ef04d79d52bf6b0b7f28a4d231cb0c':
  qdm2: Whitespace cosmetics
  flac: use meaningful return values

Conflicts:
	libavcodec/flacdec.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2013-07-29 11:34:07 +02:00
Michael Niedermayer
688331c51c Merge commit 'e13a929314e4a9a09d3146648f876f162f46cc32' 
* commit 'e13a929314e4a9a09d3146648f876f162f46cc32':
  xl: K&R formatting cosmetics

Conflicts:
	libavcodec/xl.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2013-07-29 11:08:02 +02:00
Paul B Mahol
19da86f3ff targaenc: remove unused TargaContext 
Signed-off-by: Paul B Mahol <onemda@gmail.com>
 2013-07-28 22:42:40 +00:00
Paul B Mahol
e999f2339a truemotion2: make code independent of sizeof(AVFrame) 
Signed-off-by: Paul B Mahol <onemda@gmail.com>
 2013-07-28 22:42:40 +00:00
Paul B Mahol
a5155294e5 pnm: do not set avctx->coded_frame 
Signed-off-by: Paul B Mahol <onemda@gmail.com>
 2013-07-28 22:27:36 +00:00
Paul B Mahol
329221eee7 pnm: fix 255 < maxval < 65535 for pam with depth 1 
Signed-off-by: Paul B Mahol <onemda@gmail.com>
 2013-07-28 22:27:36 +00:00
Carl Eugen Hoyos
2c046c718a Revert "Avoid overflows when reading pgm files with maxval != 255 and != 65535." 
The patch worked on little endian because pgm decoding was broken
but it was not correct in any way.

This reverts commit 7651c0e49b.
 2013-07-29 00:05:43 +02:00
Paul B Mahol
768e40b451 Revert "pnm: remove nonsense code" 
Breaks decoding pgms with 256 < maxval < 65535.

Found-by: Carl Eugen Hoyos <cehoyos@ag.or.at>.

This reverts commit a0348d0966.
 2013-07-28 21:45:37 +00:00
Luca Barbato
3ca1dd2502 xl: Make sure the width is valid 
And undo the wrong commit f1cb490d6d

CC: libav-stable@libav.org
 2013-07-28 19:36:44 +02:00
Carl Eugen Hoyos
7651c0e49b Avoid overflows when reading pgm files with maxval != 255 and != 65535. 
libjpeg v6b apparently does not initialize the most significant bits
to zero when writing 12bit pgm's with maxval 4095.
 2013-07-28 19:07:06 +02:00
Carl Eugen Hoyos
7e8e8ba9cc Assume gray8 if 1 < maxval <= 255 in pgm. 2013-07-28 18:12:23 +02:00
Carl Eugen Hoyos
ae4dc0b37a Set bits_per_raw_sample when decoding mjpeg / ljpeg. 
The ljpeg decoder also supports gray images with
8 - 15 bits per component.
 2013-07-28 17:13:01 +02:00
Paul B Mahol
b09d86c636 utvideoenc: use av_image_copy_plane() 
Signed-off-by: Paul B Mahol <onemda@gmail.com>
Signed-off-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
 2013-07-28 10:57:51 -04:00
Luca Barbato
62b1e3b103 aasc: Check minimum buffer size 
Prevent some overreads.

Reported-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
CC: libav-stable@libav.org
 2013-07-28 15:41:59 +02:00
Luca Barbato
45ee556d51 qdm2: Whitespace cosmetics 2013-07-28 14:58:19 +02:00
Luca Barbato
0e78ef0f94 flac: use meaningful return values 2013-07-28 14:58:18 +02:00
Michael Niedermayer
b0edd59994 Merge commit 'bf4b0ed1d5d323050a87c9f0ad1dd40860eb3da2' 
* commit 'bf4b0ed1d5d323050a87c9f0ad1dd40860eb3da2':
  Add missing deprecation attributes

Conflicts:
	libavfilter/avfilter.h

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2013-07-28 13:44:34 +02:00
Luca Barbato
e13a929314 xl: K&R formatting cosmetics 2013-07-28 12:45:05 +02:00
Luca Barbato
f1cb490d6d xl: Fix the buffer size check 
Also make it the first check.

Reported-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
CC: libav-stable@libav.org
 2013-07-28 12:45:05 +02:00
Michael Niedermayer
102397d2c1 Merge commit '16c22122c788b5e54a2f2e224bd0106429f0714c' 
* commit '16c22122c788b5e54a2f2e224bd0106429f0714c':
  h264: K&R formatting cosmetics

Conflicts:
	libavcodec/h264.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2013-07-28 11:40:49 +02:00
Marton Balint
63c0113588 lavc: do not override format if neither text nor bitmap codec prop is set 
Some decoders may output both, this way the decoder can set it.

Signed-off-by: Marton Balint <cus@passwd.hu>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-07-27 23:03:00 +02:00
Paul B Mahol
94ad38e2e8 dpx: use av_image_copy_plane() 
Signed-off-by: Paul B Mahol <onemda@gmail.com>
 2013-07-27 20:51:14 +00:00
Paul B Mahol
6a57494204 dpxenc: cosmetics: reindent 
Signed-off-by: Paul B Mahol <onemda@gmail.com>
 2013-07-27 20:45:48 +00:00
Paul B Mahol
9d099b9ae4 targa_y216dec: remove empty function 
Signed-off-by: Paul B Mahol <onemda@gmail.com>
 2013-07-27 20:27:15 +00:00
Paul B Mahol
0909f3edbd zmbv: return meaningful error code 
Signed-off-by: Paul B Mahol <onemda@gmail.com>
 2013-07-27 20:21:33 +00:00
Paul B Mahol
60a7fac61b utvideoenc: use av_image_copy_plane() 
Signed-off-by: Paul B Mahol <onemda@gmail.com>
 2013-07-27 20:07:48 +00:00
Tim.Nicholson
84e345b38e Forward interlaced field information from mov to v210 decoder. 
Reported and tested by Dave Rice.

Signed-off-by: Carl Eugen Hoyos <cehoyos@ag.or.at>
 2013-07-27 18:57:28 +02:00
Diego Biurrun
bf4b0ed1d5 Add missing deprecation attributes 2013-07-27 16:08:49 +02:00
Michael Niedermayer
3adf054b22 avcodec/vorbisenc: change 6 asserts to av_asserts() 
speed relevant ones use av_assert2()

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-07-27 15:23:13 +02:00
Michael Niedermayer
5e763920a4 avcodec/mpegvideo: update disabled assert() to av_assert0() 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-07-27 15:23:13 +02:00
Paul B Mahol
88b071a473 exr: set pict_type 
Signed-off-by: Paul B Mahol <onemda@gmail.com>
 2013-07-27 12:02:19 +00:00
Paul B Mahol
d9954ccff0 targa: set pict_type 
Signed-off-by: Paul B Mahol <onemda@gmail.com>
 2013-07-27 12:02:18 +00:00
Paul B Mahol
3ea5d01a12 escape130: make "chroma_vals" static 
Signed-off-by: Paul B Mahol <onemda@gmail.com>
 2013-07-27 12:02:18 +00:00
Paul B Mahol
6dbcecd78e lclenc: allocate FF_INPUT_BUFFER_PADDING_SIZE for extradata 
Also check return value.

Signed-off-by: Paul B Mahol <onemda@gmail.com>
 2013-07-27 12:02:18 +00:00
Paul B Mahol
573018c61f lclenc: cosmetics: reindent 
Signed-off-by: Paul B Mahol <onemda@gmail.com>
 2013-07-27 12:00:25 +00:00
Paul B Mahol
86e722ab97 sgidec: safer check for buffer overflow 
Signed-off-by: Paul B Mahol <onemda@gmail.com>
 2013-07-27 12:00:25 +00:00
Paul B Mahol
997e2b59e3 sgidec: return meaningful error codes 
Signed-off-by: Paul B Mahol <onemda@gmail.com>
 2013-07-27 12:00:25 +00:00
Paul B Mahol
5efa5103b0 sgidec: simplify return path 
Signed-off-by: Paul B Mahol <onemda@gmail.com>
 2013-07-27 12:00:25 +00:00
Diego Biurrun
16c22122c7 h264: K&R formatting cosmetics 2013-07-27 10:47:38 +02:00
Michael Niedermayer
205f423e28 libavcodec/mpegvideo: change some asserts to av_assert0() 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-07-26 22:29:55 +02:00
Michael Niedermayer
c88bbc01eb avcodec/mpegvideo: replace assert about interlaced EC by debug av_log() 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-07-26 22:29:47 +02:00
Paul B Mahol
1fa0284c57 qcelpdec: change asserts to av_asserts 
Signed-off-by: Paul B Mahol <onemda@gmail.com>
 2013-07-26 18:32:27 +00:00
Paul B Mahol
fdf9296df7 sgienc: remove unused SgiContext 
Signed-off-by: Paul B Mahol <onemda@gmail.com>
 2013-07-26 18:21:44 +00:00
Paul B Mahol
2868035d95 pcxenc: get rid of unused PCXContext 
Signed-off-by: Paul B Mahol <onemda@gmail.com>
 2013-07-26 14:00:40 +00:00
Paul B Mahol
3838637bbb yop: check return value of av_frame_alloc() 
Signed-off-by: Paul B Mahol <onemda@gmail.com>
 2013-07-26 13:51:26 +00:00
Paul B Mahol
9437259276 vmnc: check return values of reallocation 
Also avoid memory leaks.

Signed-off-by: Paul B Mahol <onemda@gmail.com>
 2013-07-26 13:49:36 +00:00
Paul B Mahol
cf5ab8b6f7 vmnc: make code independent of sizeof(AVFrame) 
Signed-off-by: Paul B Mahol <onemda@gmail.com>
 2013-07-26 13:39:40 +00:00
Michael Niedermayer
46ad2d9e44 Merge remote-tracking branch 'qatar/master' 
* qatar/master:
  miscellaneous typo fixes

Conflicts:
	configure
	libavformat/avisynth.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2013-07-26 11:12:11 +02:00
Michael Niedermayer
5dc2c99055 Merge commit '93a51984a27f3ba84d4e6f13d0c704ee9891603e' 
* commit '93a51984a27f3ba84d4e6f13d0c704ee9891603e':
  mpeg12: Ignore slice threading if hwaccel is active

Conflicts:
	libavcodec/mpeg12dec.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2013-07-26 10:57:51 +02:00
Michael Niedermayer
bbc7d33a0d Merge commit '582963a8156522582e55466be4a59974a8d909a5' 
* commit '582963a8156522582e55466be4a59974a8d909a5':
  vdpau: Fix VC-1 interlaced mode

Conflicts:
	libavcodec/vdpau_vc1.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2013-07-26 10:51:42 +02:00
Michael Niedermayer
af7949fdea Merge commit '4a2ef39442bf7f0150db07a1fbfcf8286e4d44a3' 
* commit '4a2ef39442bf7f0150db07a1fbfcf8286e4d44a3':
  cosmetics: Add '0' to float constants ending in '.'.

Conflicts:
	libavcodec/ra288.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2013-07-26 10:43:12 +02:00
Michael Niedermayer
e28fabb4cb Merge commit '6c145ecf785dc3d26ba3fed3ea9892cc80244625' 
* commit '6c145ecf785dc3d26ba3fed3ea9892cc80244625':
  twinvq: K&R formatting cosmetics

Conflicts:
	libavcodec/twinvq.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2013-07-26 10:30:47 +02:00
Diego Biurrun
03039f4c8c miscellaneous typo fixes 2013-07-25 19:43:32 +02:00
Rémi Denis-Courmont
93a51984a2 mpeg12: Ignore slice threading if hwaccel is active 
Slice threading does not work with hardware acceleration, as decoding
is per-picture.  This fixes Bugzilla #542.

Signed-off-by: Diego Biurrun <diego@biurrun.de>
 2013-07-25 19:43:32 +02:00
Carl Eugen Hoyos
9375879d57 Show max bitrate for mpeg2 video streams in avcodec_string(). 
See also 25b7aa9
 2013-07-25 19:08:19 +02:00
Rainer Hochecker
582963a815 vdpau: Fix VC-1 interlaced mode 
VDPAU expects the bitstream value (0, 2 or 3).
libavcodec uses an enum (0, 1 or 2).

Signed-off-by: Rémi Denis-Courmont <remi@remlab.net>
Signed-off-by: Diego Biurrun <diego@biurrun.de>
 2013-07-25 14:19:17 +02:00
Diego Biurrun
4a2ef39442 cosmetics: Add '0' to float constants ending in '.'. 2013-07-25 11:33:23 +02:00
Diego Biurrun
6c145ecf78 twinvq: K&R formatting cosmetics 2013-07-25 11:17:06 +02:00
Michael Niedermayer
0815b23062 Merge remote-tracking branch 'qatar/master' 
* qatar/master:
  arm: Comment out unused labels in simple_idct_arm

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2013-07-25 10:15:08 +02:00
Michael Niedermayer
6db57fa8bc avcodec/mjpegdec: Support RGBA lpegs 
Fixes Ticket896

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-07-25 00:32:44 +02:00
Martin Storsjö
54ba52077c arm: Comment out unused labels in simple_idct_arm 
When building for iOS in thumb mode, gas-preprocessor.pl doesn't
mark unused labels as thumb functions (as it does for other
local labels, where it can figure out that they are functions
due to being referenced in branch instructions). This leads to
linker warnings for some of those local labels, such as:

ld: warning: ARM function not 4-byte aligned: __a_evaluation from
libavcodec/libavcodec.a(simple_idct_arm.o)

Therefore, comment them out since they don't have any function.
They do still have a value in documenting key points in the
assembly source though.

Signed-off-by: Martin Storsjö <martin@martin.st>
 2013-07-24 22:43:21 +03:00
Michael Niedermayer
101c7ea906 avcodec/mpeg12dec: remove commented out assert 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-07-24 13:00:04 +02:00
Michael Niedermayer
800637709c alsdec: minor simplification in read_block() 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-07-24 12:36:52 +02:00
Michael Niedermayer
7dec8512be Merge remote-tracking branch 'qatar/master' 
* qatar/master:
  8bps: Make the bound-checks consistent

Conflicts:
	libavcodec/8bps.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2013-07-24 12:01:29 +02:00
Michael Niedermayer
da0f67b177 Merge commit 'bd7b4da0f4627bb6c4a7c2575da83fe6b261a21c' 
* commit 'bd7b4da0f4627bb6c4a7c2575da83fe6b261a21c':
  8bps: Bound-check the input buffer

Conflicts:
	libavcodec/8bps.c

See: 66ff90f4a3
Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2013-07-24 11:45:54 +02:00
Michael Niedermayer
82654172ce Merge commit '2f034f255c49050e894ab9b88087c09ebe249f3f' 
* commit '2f034f255c49050e894ab9b88087c09ebe249f3f':
  4xm: Reject not a multiple of 16 dimension

The newly added checks are redundant and thus replaced by asserts

See: db5b487551
Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2013-07-24 11:31:14 +02:00
Michael Niedermayer
a550926705 Merge commit 'ca488ad480360dfafcb5766f7bfbb567a0638979' 
* commit 'ca488ad480360dfafcb5766f7bfbb567a0638979':
  alsdec: Clean up error paths

Conflicts:
	libavcodec/alsdec.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2013-07-24 10:31:10 +02:00
Michael Niedermayer
865f34823c Merge commit '70ecc175c7b513a153ac87d1c5d219556ca55070' 
* commit '70ecc175c7b513a153ac87d1c5d219556ca55070':
  alsdec: Fix the clipping range

Conflicts:
	libavcodec/alsdec.c

See: feaff427c0

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2013-07-24 10:15:50 +02:00
Michael Niedermayer
274a50ab57 avcodec/utils: Warn the user about the lack of a lock manager if insufficient locks are detected 
A lock manager is not the only possibility to avoid open/close locking
issues but its easier and more robust than maintaining a lot of lock/unlock
calls.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-07-24 01:11:09 +02:00
Luca Barbato
6fd221e5f8 8bps: Make the bound-checks consistent 2013-07-23 23:03:37 +02:00
Luca Barbato
bd7b4da0f4 8bps: Bound-check the input buffer 
Reported-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
CC: libav-stable@libav.org
 2013-07-23 23:03:37 +02:00
Luca Barbato
2f034f255c 4xm: Reject not a multiple of 16 dimension 
Reported-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
CC: libav-stable@libav.org
 2013-07-23 23:03:37 +02:00
Luca Barbato
ca488ad480 alsdec: Clean up error paths 
Fix at least a memory leak.

CC: libav-stable@libav.org
 2013-07-23 23:03:37 +02:00
Luca Barbato
70ecc175c7 alsdec: Fix the clipping range 
mcc_weightings is only 32 elements.

Reported-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
CC: libav-stable@libav.org
 2013-07-23 23:03:37 +02:00
Michael Niedermayer
55db06af64 avcodec/utils: use av_assert0() to check validity of input pointers for start code search 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-07-23 21:23:09 +02:00
Michael Niedermayer
abc8110f7e avcodec: add avcodec_chroma_pos_to_enum() 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-07-23 03:11:28 +02:00
Michael Niedermayer
b7397857e2 avcodec: add avcodec_enum_to_chroma_pos() 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-07-23 03:07:30 +02:00
clook
4443213d2e avcodec/libopenjpegen: XYZ 12 bit support for libopenjpeg encoder 2013-07-23 01:02:41 +02:00
Martin Storsjö
69e6702c01 arm: Mangle external symbols properly in new vfp assembly files 
Signed-off-by: Martin Storsjö <martin@martin.st>
 2013-07-22 14:48:30 +03:00
Martin Storsjö
47d57f24e3 arm: Mangle external symbols properly in new vfp assembly files 
Reviewed-by: Kostya Shishkov
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-07-22 13:16:21 +02:00
Michael Niedermayer
23f250d2bc Merge remote-tracking branch 'qatar/master' 
* qatar/master:
  arm: Add VFP-accelerated version of qmf_32_subbands

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2013-07-22 12:11:23 +02:00
Michael Niedermayer
366e415836 Merge commit '800ffab48a7844dd5dc0a33b8f6b8e5ed718cf2e' 
* commit '800ffab48a7844dd5dc0a33b8f6b8e5ed718cf2e':
  dcadsp: Add a new method, qmf_32_subbands

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2013-07-22 12:10:59 +02:00
Michael Niedermayer
c30eb74d18 Merge commit '8b9eba664edaddf9a304d3acbf0388b5c520781d' 
* commit '8b9eba664edaddf9a304d3acbf0388b5c520781d':
  arm: Add VFP-accelerated version of fft16

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2013-07-22 12:05:39 +02:00
Michael Niedermayer
bacba8e5d1 Merge commit 'ba6836c966debc56314ce2ef133c7f0c1fdfdeac' 
* commit 'ba6836c966debc56314ce2ef133c7f0c1fdfdeac':
  arm: Add VFP-accelerated version of dca_lfe_fir

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2013-07-22 12:04:28 +02:00
Michael Niedermayer
2305a6775d Merge commit 'b63bb251ea6d6ba23295294e37a92625c0192206' 
* commit 'b63bb251ea6d6ba23295294e37a92625c0192206':
  arm: Add VFP-accelerated version of imdct_half

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2013-07-22 11:57:05 +02:00
Michael Niedermayer
3cab228005 Merge commit 'd6e4f5fef0d811e180fd7541941e07dca9e11dc0' 
* commit 'd6e4f5fef0d811e180fd7541941e07dca9e11dc0':
  arm: Add VFP-accelerated version of int32_to_float_fmul_array8

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2013-07-22 11:55:40 +02:00
Michael Niedermayer
1573274b91 Merge commit '26ffcc7de1d98f77400a2ebe4e75055515c54587' 
* commit '26ffcc7de1d98f77400a2ebe4e75055515c54587':
  dcadec: Use int32_to_float_fmul_array8

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2013-07-22 11:48:43 +02:00
Michael Niedermayer
0d3400ec53 Merge commit '31c6f6f65c0ed5a894e26ce44ab0c3e89c82b9a2' 
* commit '31c6f6f65c0ed5a894e26ce44ab0c3e89c82b9a2':
  fmtconvert: Add a new method, int32_to_float_fmul_array8

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2013-07-22 11:48:06 +02:00
Michael Niedermayer
877bbe05ce Merge commit 'ce9ed10ac27b9cf32a6257e083ea2f052692d971' 
* commit 'ce9ed10ac27b9cf32a6257e083ea2f052692d971':
  arm: Add VFP-accelerated version of int32_to_float_fmul_scalar

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2013-07-22 11:42:19 +02:00
Michael Niedermayer
0129026c4e Merge commit '41ef1d360bac65032aa32f6b43ae137666507ae5' 
* commit '41ef1d360bac65032aa32f6b43ae137666507ae5':
  arm: Add VFP-accelerated version of synth_filter_float

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2013-07-22 11:41:37 +02:00
Michael Niedermayer
b909428dab Merge commit '4719040cd1b54381796b22056a9ae37bd2b4668d' 
* commit '4719040cd1b54381796b22056a9ae37bd2b4668d':
  libx264: Define X264_API_IMPORTS on MSVC/ICL

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2013-07-22 10:23:46 +02:00
Ben Avison
ff30d12159 arm: Add VFP-accelerated version of qmf_32_subbands 
Before           After
               Mean    StdDev   Mean    StdDev  Change
This function   1323.0  98.0      746.2  60.6   +77.3%
Overall        15400.0 336.4    14147.5 288.4    +8.9%

Signed-off-by: Martin Storsjö <martin@martin.st>
 2013-07-22 10:15:44 +03:00
Ben Avison
800ffab48a dcadsp: Add a new method, qmf_32_subbands 
This does most of the work formerly carried out by
the static function qmf_32_subbands() in dcadec.c.

Signed-off-by: Martin Storsjö <martin@martin.st>
 2013-07-22 10:15:42 +03:00
Martin Storsjö
8b9eba664e arm: Add VFP-accelerated version of fft16 
Before           After
               Mean    StdDev   Mean    StdDev  Change
This function   1389.3  4.2       967.8  35.1   +43.6%
Overall        15577.5 83.2     15400.0 336.4    +1.2%

Signed-off-by: Martin Storsjö <martin@martin.st>
 2013-07-22 10:15:41 +03:00
Martin Storsjö
ba6836c966 arm: Add VFP-accelerated version of dca_lfe_fir 
Before           After
               Mean    StdDev   Mean    StdDev  Change
This function    868.2  33.5      436.0  27.0   +99.1%
Overall        15973.0 223.2    15577.5  83.2    +2.5%

Signed-off-by: Martin Storsjö <martin@martin.st>
 2013-07-22 10:15:39 +03:00
Martin Storsjö
b63bb251ea arm: Add VFP-accelerated version of imdct_half 
Before           After
               Mean    StdDev   Mean    StdDev  Change
This function   2653.0  28.5     1108.8  51.4   +139.3%
Overall        17049.5 408.2    15973.0 223.2     +6.7%

Signed-off-by: Martin Storsjö <martin@martin.st>
 2013-07-22 10:15:37 +03:00
Ben Avison
d6e4f5fef0 arm: Add VFP-accelerated version of int32_to_float_fmul_array8 
Before           After
               Mean    StdDev   Mean    StdDev  Change
This function    366.2  18.3      277.8  13.7   +31.9%
Overall        18420.5 489.1    17049.5 408.2    +8.0%

Signed-off-by: Martin Storsjö <martin@martin.st>
 2013-07-22 10:15:36 +03:00
Ben Avison
26ffcc7de1 dcadec: Use int32_to_float_fmul_array8 
Signed-off-by: Martin Storsjö <martin@martin.st>
 2013-07-22 10:15:35 +03:00
Ben Avison
31c6f6f65c fmtconvert: Add a new method, int32_to_float_fmul_array8 
This is similar to int32_to_float_fmul_scalar, but
loads a new scalar multiplier every 8 input samples.
This enables the use of much larger input arrays, which
is important for pipelining on some CPUs (such as
ARMv6).

Signed-off-by: Martin Storsjö <martin@martin.st>
 2013-07-22 10:15:33 +03:00
Ben Avison
ce9ed10ac2 arm: Add VFP-accelerated version of int32_to_float_fmul_scalar 
Before           After
               Mean    StdDev   Mean    StdDev  Change
This function   1175.0   4.4      366.2  18.3   +220.8%
Overall        19285.5 292.0    18420.5 489.1     +4.7%

Signed-off-by: Martin Storsjö <martin@martin.st>
 2013-07-22 10:15:30 +03:00
Ben Avison
41ef1d360b arm: Add VFP-accelerated version of synth_filter_float 
Before           After
               Mean    StdDev   Mean    StdDev  Change
This function   9295.0 114.9     4853.2 83.5    +91.5%
Overall        23699.8 397.6    19285.5 292.0   +22.9%

Signed-off-by: Martin Storsjö <martin@martin.st>
 2013-07-22 10:15:17 +03:00
Michael Niedermayer
682e8a694f avcodec/h264_sei: Try to make code more robust by jumping to the specified SEI ends 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-07-22 02:48:13 +02:00
Justin Ruggles
8000206abc libspeexdec: fix detection of final terminator code 2013-07-21 16:36:31 -04:00
Michael Niedermayer
118a1c2f4c avcodec/ff_h264_decode_sei: use skip_bits_long() 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-07-21 17:57:15 +02:00
Michael Niedermayer
45da7a0e8f avcodec/ff_h264_decode_sei: Check SEI size 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-07-21 17:57:15 +02:00
Michael Niedermayer
80c873a87e avcodec/ff_h264_decode_sei: fix integer overflow with size. 
This issue is hypothetical and no testcase is available.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-07-21 17:57:15 +02:00
Michael Niedermayer
800ffa1fc0 avcodec/h264_sei/ff_h264_decode_sei: fix error codes for insufficient data 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-07-21 17:57:15 +02:00
Joakim Plate
8710a634a5 h264: add frame packing as stereo_mode frame metadata 
This matches the matroska defintion of stereo_mode, with
no metadata written if no info exist in sei

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-07-21 16:04:02 +02:00
Derek Buitenhuis
4719040cd1 libx264: Define X264_API_IMPORTS on MSVC/ICL 
libx264 has a few data exports which require X264_API_IMPORTS
to be defined if we link to libx264 dynamically on Windows.

In a similar fashion to how we handle our compat snprintf
implementation, if we define it all the time, the compiler
will first try and link to __imp_x264_symbol_name, and failing
that, as in the case of a static libx264, will attempt to link
to the non-prefixed symbol, which has already been pulled in by
other x264 functions' object files.

Signed-off-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
 2013-07-21 08:56:25 -04:00
Michael Niedermayer
0a28a52d53 Merge commit 'dd0bfc3a6a310e3e3674ce7742672d689a9a0e93' 
* commit 'dd0bfc3a6a310e3e3674ce7742672d689a9a0e93':
  dsicinav: Bound-check the source buffer when needed

Conflicts:
	libavcodec/dsicinav.c

See: 47f0beadba
Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2013-07-21 11:59:16 +02:00
Michael Niedermayer
75fbe41fc6 Merge commit 'fcae3ff124ee97c9265e3b93f3d41238b2aee9bd' 
* commit 'fcae3ff124ee97c9265e3b93f3d41238b2aee9bd':
  dsicinav: K&R formatting cosmetics

Conflicts:
	libavcodec/dsicinav.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2013-07-21 11:45:48 +02:00
Michael Niedermayer
953c7550f8 avcodec/snowenc: convert speed relevant asserts to av_assert2() 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-07-21 04:40:12 +02:00
Michael Niedermayer
7b79c84b40 avcodec/snowdec: remove assert.h include, its unused 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-07-21 04:36:32 +02:00
Michael Niedermayer
1434df3b93 jpeg2000dec: Support non subsampled 9-16bit planar pixel formats 
This applies changes similar to fc6de70c44
to the >8bit codepath

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-07-21 04:16:53 +02:00
Luca Barbato
fd81899321 dsicinav: Clip the source size to the expected maximum 
A packet larger than cin->bitmap_size does not make sense.

Reported-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
CC: libav-stable@libav.org
 2013-07-19 22:14:07 +02:00
Luca Barbato
dd0bfc3a6a dsicinav: Bound-check the source buffer when needed 
Reported-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
CC: libav-stable@libav.org
 2013-07-19 22:14:07 +02:00
Luca Barbato
fcae3ff124 dsicinav: K&R formatting cosmetics 2013-07-19 22:14:07 +02:00
Michael Niedermayer
db33010483 jpeg2000dec: silence unused variable warning 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-07-19 17:54:57 +02:00
Piotr Bandurski
5f39992ed9 bmp: fix decoding of flipped rle4 
Fixes ticket #2794

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-07-19 17:42:34 +02:00
Michael Niedermayer
fc6de70c44 jpeg2000dec: Support non subsampled 8bit planar pixel formats 
Fixes file2.jp2

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-07-18 21:50:32 +02:00
Michael Niedermayer
99de97cabf jpeg2000dec: parse CDEF 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

Conflicts:

	libavcodec/jpeg2000dec.c

Reviewed-by: Paul B Mahol <onemda@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-07-18 21:43:42 +02:00
Carl Eugen Hoyos
b39a6bbe7f Fix pix_fmt detection in the native jpeg2000 decoder. 
Based on b7a928b by Michael Bradshaw.
Fixes ticket #2683.

Reviewed-by: Nicolas Bertrand
 2013-07-18 13:51:24 +02:00
Michael Niedermayer
9d01bf7d66 Merge remote-tracking branch 'qatar/master' 
* qatar/master:
  Consistently use "cpu_flags" as variable/parameter name for CPU flags

Conflicts:
	libavcodec/x86/dsputil_init.c
	libavcodec/x86/h264dsp_init.c
	libavcodec/x86/hpeldsp_init.c
	libavcodec/x86/motion_est.c
	libavcodec/x86/mpegvideo.c
	libavcodec/x86/proresdsp_init.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2013-07-18 09:53:47 +02:00
Diego Biurrun
3ac7fa81b2 Consistently use "cpu_flags" as variable/parameter name for CPU flags 2013-07-18 00:31:35 +02:00
Vignesh Venkatasubramanian
33968c201c Fixing a stride issue in VP8 Alpha encode 
When encoding alpha channel in libvpx, the stride isn't set
properly for the alpha encoder. Fixing it.

Signed-off-by: Vignesh Venkatasubramanian <vigneshv@google.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-07-17 13:38:26 +02:00
Michael Niedermayer
b4fe41c981 Merge remote-tracking branch 'qatar/master' 
* qatar/master:
  fmtconvert: Explicitly use int32_t instead of int

Conflicts:
	libavcodec/ac3dec.c
	libavcodec/fmtconvert.c
	libavcodec/fmtconvert.h

See: f49564c607
Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2013-07-17 10:48:56 +02:00
Michael Niedermayer
10336ca640 Merge commit '50612484e058e8b241f0528584d64d9d2ccebf12' 
* commit '50612484e058e8b241f0528584d64d9d2ccebf12':
  pthread: Rename thread_init to avoid symbol collision

Conflicts:
	libavcodec/pthread.c
	libavfilter/pthread.c

See: 674d8a9629
Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2013-07-17 10:40:15 +02:00
Christophe Gisquet
b6293e2798 fmtconvert: Explicitly use int32_t instead of int 
Signed-off-by: Martin Storsjö <martin@martin.st>
 2013-07-17 11:02:47 +03:00
Stefano Sabatini
53c853e049 lavc/h264_mp4toannexb: improve feedback in case of invalid bitstream 2013-07-17 01:17:32 +02:00
Michael Niedermayer
a80e622924 avcodec/avutil: Add AVColorSpace and AVColorRange to AVFrames 
This also moves AVColorSpace and AVColorRange from avcodec to avutil

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-07-17 01:15:31 +02:00
Stefano Sabatini
0092bcdf06 lavc/avcodec.h: fix various typos in av_bitstream_filter_filter() docs 2013-07-17 00:51:43 +02:00
Sean McGovern
50612484e0 pthread: Rename thread_init to avoid symbol collision 
The AIX threads library exposes a function with the same name.

Signed-off-by: Martin Storsjö <martin@martin.st>
 2013-07-17 00:13:31 +03:00
Michael Niedermayer
0b95f01140 Merge commit '8f24c12be7a3b3ea105e67bba9a867fe210a2333' 
* commit '8f24c12be7a3b3ea105e67bba9a867fe210a2333':
  ac3dec: Don't consume more data than the actual input packet size

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2013-07-15 23:42:58 +02:00