generic-library/ffmpeg
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity
52,591 Commits 24 Branches 241 Tags 173 MiB
5299ee54a7
Commit Graph

23743 Commits

Author SHA1 Message Date
Michael Niedermayer
3d68f5e032 h264_direct: assert the validity of the spatial ref 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-03-30 21:13:19 +01:00
Michael Niedermayer
285c5f6838 h264: move last_slice_type reset into decode_slice_header 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-03-30 20:57:31 +01:00
Michael Niedermayer
11c3381ce3 h264: move the default_ref_list_done check down after its inputs have been written 
Fixes out of array read

Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-03-30 20:28:00 +01:00
Michael Niedermayer
3f2ce24f59 h264_refs: assert that the references are not deallocated 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-03-30 20:28:00 +01:00
Michael Niedermayer
fbb6741a84 h264_refs: assert that long ref fields have not been inserted multiple times 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-03-30 20:28:00 +01:00
Michael Niedermayer
746016598d h264: Move slice_table clean out of frame_start 
Fixes inconsistency ultimately leading to an out of array read

Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-03-30 20:28:00 +01:00
Matt Wolenetz
1d6e618939 vp8: Fix pthread_cond and pthread_mutex leaks 
CC: libav-stable@libav.org

Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
 2013-03-30 16:08:50 +01:00
Paul B Mahol
95c7cad70c lavc: remove empty function 
Signed-off-by: Paul B Mahol <onemda@gmail.com>
 2013-03-30 03:23:02 +00:00
Stefano Sabatini
37fce84e27 lavc/libtheoraenc: clarify comment about global_quality to quality conversion 2013-03-30 16:58:40 +01:00
Carl Eugen Hoyos
670bb1c979 Fix compilation with --enable-decoder=webp --disable-decoder=vp8 2013-03-30 08:25:44 +01:00
Matt Wolenetz
65340c976c Fix pthread_cond and pthread_mutex leaks in vp8 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-03-29 21:36:04 +01:00
Paul B Mahol
1c11ab82d6 paf_video: make code independent of sizeof(AVFrame) 
Signed-off-by: Paul B Mahol <onemda@gmail.com>
 2013-03-29 20:19:10 +00:00
Michael Niedermayer
66e9716a36 aacps: correct opdipd code to match spec 
This fixes out of array reads

Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-03-29 21:03:59 +01:00
Paul B Mahol
a345b7f906 vmdav: use more unchecked bytestream2 variants where it makes sense 
Signed-off-by: Paul B Mahol <onemda@gmail.com>
 2013-03-29 19:48:45 +00:00
Paul B Mahol
67f9bbbb3f noise_bsf: check if allocation failed 
Signed-off-by: Paul B Mahol <onemda@gmail.com>
 2013-03-29 19:00:16 +00:00
Paul B Mahol
8263726c69 lavc: fix typo 
Signed-off-by: Paul B Mahol <onemda@gmail.com>
 2013-03-29 18:59:56 +00:00
Xidorn Quan
c7269e3a26 vda_h264_dec: fit the new API 
It fixes a memory leak in this decoder caused by the API change.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-03-29 17:55:48 +01:00
Michael Niedermayer
aa28c42534 mjpegdec: check buffer before using it 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-03-29 05:00:15 +01:00
Michael Niedermayer
6ae03353de mpegvideo: Make the table reallocation more robust. 
This fixes out of array writes after resolution changes
No FFmpeg releases are known to be affected by this

Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-03-29 02:11:34 +01:00
Michael Niedermayer
3969b4b861 gmc: Always use edge emu 
The gmc functions access more pixels than there is allocated memory.
Fixes out of array reads

Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-03-28 22:24:33 +01:00
Michael Niedermayer
8fc52a5ef9 wmv2: drop non emu edge mode 
slightly (~ 0.5%) faster, tested with time ./ffmpeg

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-03-28 21:59:23 +01:00
Michael Niedermayer
76e6b1eba1 wmv2: Use emu edge mode when the edge is too small 
Fixes out of array read

Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-03-28 21:50:53 +01:00
Michael Niedermayer
92002db3eb h264_refs: Check for attempts to assign pictures to short & long. 
Fixes null pointer dereference

Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-03-28 21:09:47 +01:00
Michael Niedermayer
37bdf33cff Merge remote-tracking branch 'qatar/master' 
* qatar/master:
  vmdav: convert to bytestream2
  FATE: add a test for the join filter
  FATE: add a test for the volume filter

Conflicts:
	libavcodec/vmdav.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2013-03-28 15:02:49 +01:00
Michael Niedermayer
2b6185cac9 Merge commit 'b4d24b471bc52f1f78a43ee330199e70483e51c3' 
* commit 'b4d24b471bc52f1f78a43ee330199e70483e51c3':
  build: Remove configure-generated .config file on distclean
  msmpeg4: Split decoding related functions to a separate file

Conflicts:
	Makefile
	libavcodec/Makefile
	libavcodec/msmpeg4.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2013-03-28 12:07:38 +01:00
Michael Niedermayer
2bfcd74ad3 Merge commit 'e557584aa7df6ac9f52af7ee7e5c963437da2e2f' 
* commit 'e557584aa7df6ac9f52af7ee7e5c963437da2e2f':
  mpeg12: Move Mpeg1Context declaration to the only place it is used

Conflicts:
	libavcodec/mpeg12.h
	libavcodec/mpeg12dec.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2013-03-28 11:56:05 +01:00
Michael Niedermayer
016c00cf68 Merge commit '1b6d66745ac1768adb387c2227cdcf4452271149' 
* commit '1b6d66745ac1768adb387c2227cdcf4452271149':
  Split MPEG-1/2 decoder code off from MPEG-1/2 common code

Conflicts:
	libavcodec/Makefile
	libavcodec/mpeg12.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2013-03-28 11:45:50 +01:00
Michael Niedermayer
385ffc7650 Merge commit 'eee2000b41234ae9465c314e18bfec1700181f32' 
* commit 'eee2000b41234ae9465c314e18bfec1700181f32':
  mpeg12: Move some ff_mpeg1_* function declarations to a more suitable place

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2013-03-28 11:30:29 +01:00
Michael Niedermayer
63a97d5674 Merge commit 'b6649ab5037fb55f78c2606f3d23cea0867cdeaa' 
* commit 'b6649ab5037fb55f78c2606f3d23cea0867cdeaa':
  cosmetics: Remove unnecessary extern keywords from function declarations

Conflicts:
	libswscale/x86/swscale.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2013-03-28 11:20:41 +01:00
Michael Niedermayer
b1064dd783 Merge commit '1db6a080bddd14fed6b29140ecd2e21e42b1c022' 
* commit '1db6a080bddd14fed6b29140ecd2e21e42b1c022':
  dca: Move ff_dca_convert_bitstream() to the DCA common code
  vdpau: wrap codec specific functions in appropiate #ifs

Conflicts:
	libavcodec/Makefile

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2013-03-28 11:18:23 +01:00
Alexandra Khirnova
0afcf97e1e vmdav: convert to bytestream2 
Signed-off-by: Anton Khirnov <anton@khirnov.net>
 2013-03-28 08:30:38 +01:00
Michael Niedermayer
e234daa518 mlpdec: Fix reading state with 0 bit elements. 
This fixes an assertion failure

Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-03-28 04:01:34 +01:00
Michael Niedermayer
10ece44d09 h264_cavlc: fix assertion failure due to reading too long vlc 
Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-03-28 04:01:34 +01:00
Michael Niedermayer
a56d963f11 vp3: Check fps validity more completely 
Fix assertion failure

Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-03-28 00:56:12 +01:00
Michael Niedermayer
c6831e2a70 wavpack: check K, fix assertion failure 
Instead of this it would be possible to change the code to support
larger K but that would make the code slower and probably still need
checks on K.
This variant is choosen as there are no known valid files that need
larger K

Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-03-28 00:54:45 +01:00
Michael Niedermayer
e9d3b40052 snow: drop commented out asserts 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-03-27 23:06:29 +01:00
Martin Storsjö
3891a270f5 msmpeg4: Split decoding related functions to a separate file 
This fixes standalone compilation of the msmpeg4v2, msmpeg4v3
and wmv2 encoders, that previously failed to link due to the
decoder codepaths requiring error_resilience.

Signed-off-by: Martin Storsjö <martin@martin.st>
 2013-03-27 15:45:56 +02:00
Diego Biurrun
e557584aa7 mpeg12: Move Mpeg1Context declaration to the only place it is used 2013-03-27 14:26:11 +01:00
Diego Biurrun
1b6d66745a Split MPEG-1/2 decoder code off from MPEG-1/2 common code 2013-03-27 14:26:11 +01:00
Diego Biurrun
eee2000b41 mpeg12: Move some ff_mpeg1_* function declarations to a more suitable place 2013-03-27 14:21:45 +01:00
Diego Biurrun
b6649ab503 cosmetics: Remove unnecessary extern keywords from function declarations 2013-03-27 14:21:45 +01:00
Diego Biurrun
1db6a080bd dca: Move ff_dca_convert_bitstream() to the DCA common code 
This makes the DCA parser and decoder independent.
 2013-03-27 14:21:45 +01:00
Janne Grunau
b247253929 vdpau: wrap codec specific functions in appropiate #ifs 
Fixes linking when only a subset of the deprecated vdpau decoders is
enabled.
 2013-03-27 13:20:13 +01:00
Michael Niedermayer
ace0cfea60 Merge remote-tracking branch 'qatar/master' 
* qatar/master:
  hwaccel: fix use with frame based multithreading

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

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2013-03-27 11:51:33 +01:00
Michael Niedermayer
12f203a098 Merge commit 'c24469e812501903a46a06eff9722a82e136e841' 
* commit 'c24469e812501903a46a06eff9722a82e136e841':
  utils: add workaround for AVHWAccel in ff_get_buffer compat code
  configure: Remove a stray msmpeg4v1 encoder declaration

Conflicts:
	libavcodec/utils.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2013-03-27 11:42:15 +01:00
Michael Niedermayer
ef8ab2f953 Merge commit '3b2d0ec473b036bdd0a5bc0d896fd5292915f44d' 
* commit '3b2d0ec473b036bdd0a5bc0d896fd5292915f44d':
  configure: Remove the mpegvideo dependency from svq1
  x86: vc1dsp: Fix indentation

Conflicts:
	configure

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2013-03-27 11:32:45 +01:00
Janne Grunau
757d85868b vdpau: fix obsolete mpeg1 vdpau decoder when mpeg2 is disabled 2013-03-26 22:53:29 +01:00
Michael Niedermayer
46c48d546d mpegvideo: fix null pointer dereference on switching streams 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-03-26 21:54:36 +01:00
Janne Grunau
05fa79b844 hwaccel: fix use with frame based multithreading 
Allows use of AVHWAccel based decoders with frame based multithreading.
The decoders will be forced into an non-concurrent mode by delaying
ff_thread_finish_setup() calls after decoding of the current frame
is finished.

This wastes memory by unnecessarily using multiple threads and thus
copies of the decoder context but allows seamless switching between
hardware accelerated and frame threaded software decoding when the
hardware decoder does not support the stream.
 2013-03-26 19:44:50 +01:00
Janne Grunau
c24469e812 utils: add workaround for AVHWAccel in ff_get_buffer compat code 
Since c977039e58 plane count for
PIX_FMT_HWACCEL pixel formats is 0 instead of 1. The created dummy
AVBuffers are still bogus since AVFrame does not hold frame data when
AVHWAccels are used.
 2013-03-26 19:44:50 +01:00
Michael Niedermayer
7b3ca7ae8b mpegvideo/h264: drop period_since_free 
This should not be needed anymore

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-03-26 19:27:32 +01:00
Martin Storsjö
a2acadd058 x86: vc1dsp: Fix indentation 
Signed-off-by: Martin Storsjö <martin@martin.st>
 2013-03-26 15:49:42 +02:00
Michael Niedermayer
365ad0042a Merge remote-tracking branch 'qatar/master' 
* qatar/master:
  h264: Make it possible to compile without error_resilience

Conflicts:
	configure
	libavcodec/h264.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2013-03-26 14:36:00 +01:00
Michael Niedermayer
b19604cc4b Merge commit 'f1e9398621af0bc9d166014e4ce6996bb4f141d0' 
* commit 'f1e9398621af0bc9d166014e4ce6996bb4f141d0':
  lavc: Rename avpriv_mpv_find_start_code after moving out from mpegvideo

Conflicts:
	libavcodec/h264_parser.c
	libavcodec/internal.h
	libavcodec/mpeg12.c
	libavcodec/utils.c
	libavformat/mpegtsenc.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2013-03-26 13:44:09 +01:00
Michael Niedermayer
2cdedcbcea Merge commit '75644335b907919057960716508477239c26fed4' 
* commit '75644335b907919057960716508477239c26fed4':
  lavc: Move start code finding to utils.c

Conflicts:
	configure
	libavcodec/mpegvideo.c
	libavcodec/utils.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2013-03-26 13:22:48 +01:00
Michael Niedermayer
795b911bd8 Merge commit '613a37eca4c7b8eefceaa3e0231c23ad090ca94f' 
* commit '613a37eca4c7b8eefceaa3e0231c23ad090ca94f':
  ape: 3.80-3.92 decoding support
  h264: Remove an unused variable

Conflicts:
	libavcodec/apedec.c
	libavformat/ape.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2013-03-26 13:14:16 +01:00
Michael Niedermayer
9b9205e760 x86/dsputil.asm: make unaligned bswap actually work 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-03-26 13:07:46 +01:00
Michael Niedermayer
cb69a9dbf4 Merge commit 'e5c2794a7162e485eefd3133af5b98fd31386aeb' 
* commit 'e5c2794a7162e485eefd3133af5b98fd31386aeb':
  x86: consistently use unaligned movs in the unaligned bswap

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2013-03-26 13:07:37 +01:00
Ronald S. Bultje
0b499c9b06 h264: Make it possible to compile without error_resilience 
Error resilience is enabled by the h264 decoder, unless explicitly
disabled. --disable-everything --enable-decoder=h264 will produce
a h264 decoder with error resilience enabled, while
--disable-everything --enable-decoder=h264 --disable-error-resilience
will produce a h264 decoder with error resilience disabled.

Signed-off-by: Martin Storsjö <martin@martin.st>
 2013-03-26 09:55:05 +02:00
Martin Storsjö
f1e9398621 lavc: Rename avpriv_mpv_find_start_code after moving out from mpegvideo 
Also move the declaration to internal.h, and add restrict qualifiers
to the declaration (as in the implementation).

Signed-off-by: Martin Storsjö <martin@martin.st>
 2013-03-26 09:50:02 +02:00
Martin Storsjö
75644335b9 lavc: Move start code finding to utils.c 
This allows dropping the mpegvideo dependency from a number of
components.

This also fixes standalone building of the h264 parser, which
was broken in 64e438697.

Signed-off-by: Martin Storsjö <martin@martin.st>
 2013-03-26 09:48:12 +02:00
Michael Niedermayer
ea7b96af96 avcodec/x86/dsputil_qns_template: use av_assert 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-03-26 04:08:28 +01:00
Kostya Shishkov
613a37eca4 ape: 3.80-3.92 decoding support 2013-03-25 18:40:56 +01:00
Michael Niedermayer
67607e20e8 xxan: make code independent of sizeof(AVFrame) 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-03-25 17:35:58 +01:00
Michael Niedermayer
8097e5b212 yop: Fix return type 
Found-by: durandal_1707
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-03-25 15:14:20 +01:00
Martin Storsjö
ccd349e555 h264: Remove an unused variable 
Signed-off-by: Martin Storsjö <martin@martin.st>
 2013-03-25 15:00:05 +02:00
Michael Niedermayer
afdfff485b avcodec/gifdec: Add av_log() to workaround gcc 4.2 miscompiling the code 
It appears gcc forgets to increment the byte stream pointer at -O3
I was not able to spot a reason/excuse for it to do that. It
also disappears if the function isnt inlined.

This should fix the gif fate failures on open & free bsd

See: [FFmpeg-devel] [PATCH] gifdec: workaround old gcc 4.2 mis-compiling code

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-03-25 13:32:45 +01:00
Michael Niedermayer
ad438f450b xan: make decoder independent of sizeof(AVFrame) 
Reviewed-by: Paul B Mahol <onemda@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-03-25 13:30:30 +01:00
James Almer
45013b365e lavc/flacdec: Propagate and return meaningful error codes 
Signed-off-by: James Almer <jamrial@gmail.com>
Reviewed-by: Paul B Mahol <onemda@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-03-25 13:16:33 +01:00
Janne Grunau
e5c2794a71 x86: consistently use unaligned movs in the unaligned bswap 
Fixes fate errors in asv1, ffvhuff and huffyuv on x86_32.
 2013-03-25 12:11:11 +01:00
Michael Niedermayer
01df2a13c3 avcodec/utils: initialize pixel buffer pool 
This should silence many valgrind warnings about use of uninitialized
data, all the warnings i looked at where false positives having their
uninitialized data not actually used.

The same effect could be achieved by listing all code that touches
the pixel buffer in the valgrind suppression file.
Note, valgrind also fails to trace the origins correctly.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-03-25 00:43:14 +01:00
Michael Niedermayer
e2b30194bb h264/field_end move progress report code after error concealment. 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-03-24 22:34:17 +01:00
Martin Storsjö
285ff14413 x86: Change a missed occurrance of int to ptrdiff_t for strides 
Signed-off-by: Martin Storsjö <martin@martin.st>
 2013-03-24 12:06:53 +02:00
Michael Niedermayer
8e062fd169 rawdec: fix memleak 
Fixes fate-lavf-flm under valgrind

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-03-24 04:09:04 +01:00
Michael Niedermayer
d6f9610853 yop: use reget_buffer() as the previous contents are used 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-03-24 01:41:49 +01:00
Martin Storsjö
352dbdb96c x86: Remove win64 xmm clobbering wrappers for the now removed avcodec_encode_video function 
Signed-off-by: Martin Storsjö <martin@martin.st>
 2013-03-23 23:37:27 +02:00
Michael Niedermayer
644092c8e8 h264: dont report rows as finished after a missing slice 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-03-23 21:07:57 +01:00
Bojan Zivkovic
e54eb8db9c mips: Optimization of AAC psychoacoustic model functions 
Signed-off-by: Bojan Zivkovic <bojan@mips.com>
Reviewed-by: Nedeljko Babic <Nedeljko.Babic@imgtec.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-03-23 16:19:38 +01:00
Piotr Bandurski
e26b066cd8 libspeex: support ZygoAudio (quality 10 mode) 
Fixes "quality 10" mode from Ticket1873

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-03-23 15:45:58 +01:00
Michael Niedermayer
8b63eeb6b1 Merge remote-tracking branch 'qatar/master' 
* qatar/master:
  fate: add test for cropping h264 to container dimensions
  FATE: add a tscc2 test.
  tscc2: allocate AVFrame properly.

Conflicts:
	libavcodec/tscc2.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2013-03-23 12:26:08 +01:00
Clément Bœsch
859f7da543 lavc/prores: restore pict_type and key_frame setting. 2013-03-22 23:05:50 +01:00
Michael Niedermayer
b3e9f266e8 x86/mpegvideo: switch to av_assert 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-03-22 22:57:23 +01:00
Michael Niedermayer
cdbf8409ef x86/h264_qpel: switch to av_assert 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-03-22 22:57:08 +01:00
Anton Khirnov
4e33582a0b tscc2: allocate AVFrame properly. 2013-03-22 20:10:48 +01:00
Michael Niedermayer
428e9dafab h263dec: switch to av_assert() 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-03-22 18:07:26 +01:00
Michael Niedermayer
076c1c956c vp8: WebP decoding support 
VP8L, padding and bounds checks by Pascal Massimino

Reviewed-by: Pascal Massimino <pascal.massimino@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-03-22 14:57:56 +01:00
Carl Eugen Hoyos
d98a5318fd Fix compilation with --disable-mmx. 2013-03-22 13:00:50 +01:00
Carl Eugen Hoyos
ac9b056ddb Do not fail in get_buffer_internal() if pix_fmt planes == 0. 
Fixes VDPAU decoding, reported by Ilja Sekler
 2013-03-22 01:03:07 +01:00
Michael Niedermayer
21a5f5ea5d error_resilience: fix const correctness, silence warnings 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-03-21 23:32:37 +01:00
Michael Niedermayer
732b2fde1c vdpau.h: change vdpau_render_state layout to match fork if AV_HAVE_INCOMPATIBLE_FORK_ABI 
This might fix a compatibility issue.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-03-21 23:22:33 +01:00
Andrew Euell
f8217daa8e vda_h264: fix for VDA compile 
the VDA code needs to be updated to use the CHROMA(h) macros

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-03-21 19:56:19 +01:00
Michael Niedermayer
4aa8503399 sonicdec: update to new buffer API 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-03-21 16:01:53 +01:00
Michael Niedermayer
85d7f54662 sonicenc: fix mono decorrelation 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-03-21 15:49:22 +01:00
Michael Niedermayer
6ec037c5a9 sonicdec: fix frame size 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-03-21 15:46:16 +01:00
Michael Niedermayer
1426291eb8 sonicdec: check decorrelation 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-03-21 15:45:59 +01:00
Michael Niedermayer
8251c05320 g729dec: switch to buffer refs style 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-03-21 14:48:56 +01:00
Michael Niedermayer
a728a28dac v308dec: remove unneeded self assignment 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-03-21 14:43:09 +01:00
Michael Niedermayer
f3980b75f8 h264: remove unused variable 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-03-21 13:17:55 +01:00
Michael Niedermayer
de8049d27c h264: add an argument to CHROMA for consistency 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-03-21 13:17:19 +01:00
Michael Niedermayer
881050d229 Merge remote-tracking branch 'qatar/master' 
* qatar/master:
  h264: remove redundant freeing of DPB in h264_decode_end

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2013-03-21 13:10:57 +01:00
Michael Niedermayer
86d9d349cc Merge commit '23e85be58fc64b2e804e68b0034a08a6d257e523' 
* commit '23e85be58fc64b2e804e68b0034a08a6d257e523':
  h264: add a parameter to the CHROMA444 macro.
  h264: add a parameter to the CHROMA422 macro.

Conflicts:
	libavcodec/h264.c
	libavcodec/h264.h
	libavcodec/h264_cavlc.c
	libavcodec/h264_loopfilter.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2013-03-21 13:06:14 +01:00
Michael Niedermayer
92656787cf Merge commit '6d2b6f21eb45ffbda1103c772060303648714832' 
* commit '6d2b6f21eb45ffbda1103c772060303648714832':
  h264: add a parameter to the CABAC macro.
  h264: add a parameter to the FIELD_OR_MBAFF_PICTURE macro.

Conflicts:
	libavcodec/h264.c
	libavcodec/h264_cabac.c
	libavcodec/h264_cavlc.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2013-03-21 12:58:00 +01:00
Michael Niedermayer
bf4d0f8328 Merge commit '7fa00653a550c0d24b3951c0f9fed6350ecf5ce4' 
* commit '7fa00653a550c0d24b3951c0f9fed6350ecf5ce4':
  h264: add a parameter to the FIELD_PICTURE macro.
  h264: add a parameter to the FRAME_MBAFF macro.

Conflicts:
	libavcodec/h264.c
	libavcodec/h264_loopfilter.c
	libavcodec/h264_refs.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2013-03-21 12:50:18 +01:00
Michael Niedermayer
e168b50816 Merge commit 'da6be8fcec16a94d8084bda8bb8a0a411a96bcf7' 
* commit 'da6be8fcec16a94d8084bda8bb8a0a411a96bcf7':
  h264: add a parameter to the MB_FIELD macro.
  h264: add a parameter to the MB_MBAFF macro.

Conflicts:
	libavcodec/h264.c
	libavcodec/h264_cabac.c
	libavcodec/h264_cavlc.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2013-03-21 12:43:32 +01:00
Michael Niedermayer
137df692fc Merge commit '48d0fd2d62a476e1db9298163f1fc0abae26cc67' 
* commit '48d0fd2d62a476e1db9298163f1fc0abae26cc67':
  h264: merge common_init() into ff_h264_decode_init.

Conflicts:
	libavcodec/h264.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2013-03-21 12:34:59 +01:00
Michael Niedermayer
bbc0f6f978 Merge commit '25408b2a0660c1e6c8555559c4ed71dff2ede31e' 
* commit '25408b2a0660c1e6c8555559c4ed71dff2ede31e':
  h264: make ff_h264_frame_start static.

Conflicts:
	libavcodec/h264.c
	libavcodec/h264.h

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2013-03-21 12:05:13 +01:00
Michael Niedermayer
6c8ac2d782 Merge commit '1c4073efd24164ac6eaa52c544f5cdb0e5f6aee5' 
* commit '1c4073efd24164ac6eaa52c544f5cdb0e5f6aee5':
  fate: add tests for h264 decoder reinit
  h264: fix bit depth changes with frame threading

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2013-03-21 11:56:29 +01:00
Michael Niedermayer
82f95d7fd7 h264: drop special case for 9bit chroma422 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-03-21 11:51:26 +01:00
Anton Khirnov
fcf75022d7 h264: remove redundant freeing of DPB in h264_decode_end 
free_tables() frees it already.
 2013-03-21 10:21:11 +01:00
Anton Khirnov
23e85be58f h264: add a parameter to the CHROMA444 macro. 
This way it does not look like a constant.
 2013-03-21 10:21:02 +01:00
Anton Khirnov
e962bd08ee h264: add a parameter to the CHROMA422 macro. 
This way it does not look like a constant.
 2013-03-21 10:20:58 +01:00
Anton Khirnov
6d2b6f21eb h264: add a parameter to the CABAC macro. 
This way it does not look like a constant.
 2013-03-21 10:20:52 +01:00
Anton Khirnov
a6931d8ece h264: add a parameter to the FIELD_OR_MBAFF_PICTURE macro. 
This way it does not look like a constant.
 2013-03-21 10:20:48 +01:00
Anton Khirnov
7fa00653a5 h264: add a parameter to the FIELD_PICTURE macro. 
This way it does not look like a constant.
 2013-03-21 10:20:44 +01:00
Anton Khirnov
7bece9b22f h264: add a parameter to the FRAME_MBAFF macro. 
This way it does not look like a constant.
 2013-03-21 10:20:39 +01:00
Anton Khirnov
da6be8fcec h264: add a parameter to the MB_FIELD macro. 
This way it does not look like a constant.
 2013-03-21 10:20:35 +01:00
Anton Khirnov
82313eaa34 h264: add a parameter to the MB_MBAFF macro. 
This way it does not look like a constant.
 2013-03-21 10:20:30 +01:00
Anton Khirnov
48d0fd2d62 h264: merge common_init() into ff_h264_decode_init. 
There is no point in keeping those separate.
 2013-03-21 10:20:10 +01:00
Anton Khirnov
25408b2a06 h264: make ff_h264_frame_start static. 
It is not called from outside h264.c
 2013-03-21 10:19:54 +01:00
Clément Bœsch
4331484b8d lavc/utils: fix metadata audio frame memleak in case of non refcounted frames. 
The metadata must be set before saving the frame to avci->to_free,
otherwise it will leak.

Signed-off-by: Hendrik Leppkes <h.leppkes@gmail.com>
Signed-off-by: Clément Bœsch <ubitux@gmail.com>
 2013-03-21 01:07:51 +01:00
Nedeljko Babic
271f95940b libavcodec/mips: fix for mips optimized fp fft with hard coded tables disabled 
Floating point FFT (nips optimized) breaks when hard coded tables are
not enabled because MIPS optimization of floating point FFT uses only
ff_init_ff_cos_tabs(16) which is not enabled by default in that case.

This patch is fixing it.

Signed-off-by: Nedeljko Babic <nbabic@mips.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-03-20 13:48:05 +01:00
Janne Grunau
a157c7f2b8 h264: fix bit depth changes with frame threading 
AVCodecContext.bits_per_raw_sample is updated from the previous thread
in the generic update function before the codec specific update_thread
function is called. The check for reinitialization of dsp functions uses
bits_per_raw_sample. When called from update_thread_context it will be
already at the current value and the dsp functions aren't updated if
only the bit depth changes.
 2013-03-20 13:12:10 +01:00
Bojan Zivkovic
7d29c6eebc mips: Optimization of IIR filter function 
Signed-off-by: Bojan Zivkovic <bojan@mips.com>
Reviewed-by: Nedeljko Babic <Nedeljko.Babic@imgtec.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-03-20 12:44:32 +01:00
Bojan Zivkovic
26f3924d78 mips: Optimization of AAC coefficients encoder functions 
Signed-off-by: Bojan Zivkovic <bojan@mips.com>
Reviewed-by: Nedeljko Babic <Nedeljko.Babic@imgtec.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-03-20 12:34:37 +01:00
Michael Niedermayer
f7fee8f700 Merge commit 'c3ebfcd6e1327ca7bbcaee822e593c2da6cfd352' 
* commit 'c3ebfcd6e1327ca7bbcaee822e593c2da6cfd352':
  mpegvideo: allocate hwaccel privdata after the frame buffer
  h264: allocate hwaccel privdata after the frame buffer

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2013-03-20 11:57:28 +01:00
Michael Niedermayer
084510d12a Merge commit 'c71c80f53b6a63fd6360d9de5a262f9e7c85681f' 
* commit 'c71c80f53b6a63fd6360d9de5a262f9e7c85681f':
  pthread: unref already decoded frames when flushing the decoder

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2013-03-20 11:50:33 +01:00
Michael Niedermayer
54b0bef390 Merge commit '4e70d66ded537cadd32dbd02a38c3d86a203c812' 
* commit '4e70d66ded537cadd32dbd02a38c3d86a203c812':
  mpegvideo: fix allocation of the hwaccel_picture_private data
  lavc: update the doxy for avcodec_decode_{video,audio} wtih refcounting.

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2013-03-20 11:43:29 +01:00
Michael Niedermayer
df804041bd Merge commit '6599b087de62a5f9f2a8d61a1952d777d1bff804' 
* commit '6599b087de62a5f9f2a8d61a1952d777d1bff804':
  buffersrc: fix a typo.
  lavc, lavfi: fix counting number of planes in AVBufferRef wrappers

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2013-03-20 11:30:56 +01:00
Sebastian Sandberg
db8403d04a vc1dec: interlaced B-frames 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-03-20 03:37:48 +01:00
Michael Niedermayer
d244a615f6 er: set error_occured on missing slices 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-03-20 00:52:46 +01:00
Stefano Sabatini
33b0549867 lavc/utils: add VP6F hack for setting correct video size in stream 
For some obscure reasons avcodec_set_dimensions() resets the width/height
so that the resulting value set in the stream is equal to the
corresponding coded_width/height, which is not the same as the correct
width/height in case of the H.264 and VP6F codecs.

This adds a codec-specific hack for VP6F which disables the call to
avcodec_set_dimensions() in avcodec_open2(), like it is done with H264. A
proper fix needs to be found yet.

Fix trac ticket #1386.

Based on a patch by Michael Niedermayer.

Trolled-By: Daemon404

See thread:
Subject: [FFmpeg-devel] [PATCH] ffprobe: Stash and use width and height before opening the codec
Date: Fri,  1 Mar 2013 10:41:34 -0500
 2013-03-19 23:28:08 +01:00
Nedeljko Babic
d23aefa498 mips: inline assembly clobber list polishing 
List of clobbered registers fixed and added where it is lacking.

Signed-off-by: Nedeljko Babic <nbabic@mips.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-03-19 16:51:35 +01:00
Michael Niedermayer
feeb8ca56d vp56: Check av_frame_ref() return code 
Fixes CID991837

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-03-19 15:26:23 +01:00
Michael Niedermayer
1e41b8cd07 hpeldsp: Increase put_no_rnd_pixels_tab[][] size 
Fixes CID991852

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-03-19 14:47:04 +01:00
Michael Niedermayer
2c993fece2 audio_get_buffer: add assert to ensure nb_extended_buf has a safe value 
May silence CID991853

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-03-19 14:33:47 +01:00
Michael Niedermayer
ad98567198 mpegvideo_enc: remove stray semicolon 
Fixes CID991857
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-03-19 13:47:04 +01:00
chinshou
b619a54853 alac: Fix order of values in comment 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-03-19 13:28:29 +01:00
Hendrik Leppkes
c3ebfcd6e1 mpegvideo: allocate hwaccel privdata after the frame buffer 
This ensures the hwaccel privdata does not leak when a frame buffer could
not be allocated (and toggle the assert when the frame is re-used).
Having no frame buffer available is quite common when using the DXVA2
hwaccel in situations where the DXVA2 renderer is being re-allocated, for
example when moving between displays.

Signed-off-by: Anton Khirnov <anton@khirnov.net>
 2013-03-19 11:20:22 +01:00
Hendrik Leppkes
9c9ede44f3 h264: allocate hwaccel privdata after the frame buffer 
This ensures the hwaccel privdata does not leak when a frame buffer could
not be allocated (and toggle the assert when the frame is re-used).
Having no frame buffer available is quite common when using the DXVA2
hwaccel in situations where the DXVA2 renderer is being re-allocated, for
example when moving between displays.

Signed-off-by: Anton Khirnov <anton@khirnov.net>
 2013-03-19 11:20:00 +01:00
Hendrik Leppkes
c71c80f53b pthread: unref already decoded frames when flushing the decoder 
Signed-off-by: Anton Khirnov <anton@khirnov.net>
 2013-03-19 11:19:08 +01:00
Hendrik Leppkes
4e70d66ded mpegvideo: fix allocation of the hwaccel_picture_private data 
Signed-off-by: Anton Khirnov <anton@khirnov.net>
 2013-03-19 11:18:42 +01:00
Anton Khirnov
1516bf7af1 lavc: update the doxy for avcodec_decode_{video,audio} wtih refcounting. 2013-03-19 11:12:17 +01:00
Anton Khirnov
c977039e58 lavc, lavfi: fix counting number of planes in AVBufferRef wrappers 
Number of planes is not always equal to the number of components even
for formats marked with PIX_FMT_PLANAR -- e.g. NV12 has three components
in two planes.
 2013-03-19 11:12:17 +01:00
Hendrik Leppkes
97f8c6e147 pthread: update all get_buffer checks for get_buffer2 
This restores the performance of simple frame-threaded codecs back to
their pre-merge levels.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-03-19 02:25:46 +01:00
Carl Eugen Hoyos
55bb8f4589 Fix Makefile dependency for the dvd_nav parser. 
Fixes compilation for --disable-everything --enable-parser=dvd_nav
 2013-03-19 02:11:39 +01:00
Clément Bœsch
4b35be3251 lavc: fix avpacket memleak with subtitles recoding. 2013-03-18 22:04:29 +01:00
Elvis Presley
58bc65952b libavcodec/proresdec.h: fix license header 
This was somehow missed when relicensing the decoder to LGPL

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-03-18 19:34:41 +01:00
Michael Niedermayer
0163ad66e1 mpeg2: 12LSB w/h of 0 is not allowed in compliant videos thus this also needs AV_EF_COMPLIANT 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-03-18 17:48:52 +01:00
Michael Niedermayer
330e440706 Merge remote-tracking branch 'qatar/master' 
* qatar/master:
  print_options: do not generate docs for options without enc or dec flags
  mpeg12: do not fail on zero dimensions in the sequence header.

Conflicts:
	libavcodec/mpeg12.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2013-03-18 17:43:43 +01:00
Anton Khirnov
ce0124acac mpeg12: do not fail on zero dimensions in the sequence header. 
The total frame size is a combination of the 12 bits in the sequence
header and 2 more bits in the the sequence extension. While the
specification explicitly forbids the dimensions from the sequence header
from being 0 (thus ruling out multiples of 4096), such videos
apparrently exist in the wild so we should attempt to decode them.

Based on a patch by Michael Niedermayer <michaelni@gmx.at>

Fixes Bug 416.
 2013-03-18 15:36:10 +01:00
Clément Bœsch
6abb554fd6 lavc,lavu: fix two doxy mixup between h/v chroma shift. 2013-03-18 09:04:11 +01:00
Michael Niedermayer
29e0357a11 aasc: fix pointer vs value error 
Fixes Ticket2365

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-03-18 02:10:10 +01:00
Richard
9cde9f70ab mpeg: Add passing DVD navigation packets (startcode 0x1bf) to caller to allow better playback handling of DVDs. 
The two types of packets (PCI and DSI) are passed untouched but combined by the new codec ID AV_CODEC_ID_DVD_NAV.
 The first 980 bytes in the packet contain the PCI data. The next 1018 are the DSI data.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-03-17 16:24:34 +01:00
Michael Niedermayer
fa7031ad37 h264_refs: fix typo in refs fallback check 
Fixes regression since 01a0283
Fixes Ticket2371

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-03-17 14:21:46 +01:00
Michael Niedermayer
171bd38eda Merge remote-tracking branch 'qatar/master' 
* qatar/master:
  lavc,lavfi: fix calculating the plane size in the AVBufferRef wrappers

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2013-03-17 12:59:04 +01:00
Anton Khirnov
6552808014 lavc,lavfi: fix calculating the plane size in the AVBufferRef wrappers 
It is supposed to be height * linesize, not width * linesize.
Thanks to Hendrik Leppkes for pointing out the bug.
 2013-03-17 09:10:04 +01:00
Michael Niedermayer
0f95534669 h264_qpel: fix another forgotten int stride 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-03-17 05:20:35 +01:00
Clément Bœsch
3313b9cc2d lavc: remove unecessary a64enc include. 2013-03-17 04:38:28 +01:00
Carl Eugen Hoyos
75c7e4583f Do not (re-)set libx264 parameter b_tff if interlaced encoding was not requested. 
Reconfiguring can break x264 lossless encoding.

Fixes ticket #2165.
 2013-03-16 20:13:44 +01:00
Michael Niedermayer
aef816f957 Merge commit 'ca6c3f2c53be70aa3c38e8f1292809db89ea1ba6' 
* commit 'ca6c3f2c53be70aa3c38e8f1292809db89ea1ba6':
  lzo: fix overflow checking in copy_backptr()
  flacdec: simplify bounds checking in flac_probe()
  atrac3: avoid oversized shifting in decode_bytes()

Conflicts:
	libavformat/flacdec.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2013-03-16 14:10:09 +01:00
Reimar Döffinger
23426987fa mpeg12: reduce hwaccel-related code duplication. 
Signed-off-by: Reimar Döffinger <Reimar.Doeffinger@gmx.de>
 2013-03-16 13:40:36 +01:00
ArnoB
361319d0f4 dpxenc: fix data offset 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-03-15 21:09:36 +01:00
Paul B Mahol
a9b424879f lavc & lavf: replace deprecated av_log* functions 
Signed-off-by: Paul B Mahol <onemda@gmail.com>
 2013-03-15 18:10:28 +00:00
Michael Niedermayer
64308941d4 mpegvideo: Fix exported qp table offest 
Found-by: wm4
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-03-15 14:38:09 +01:00
Michael Niedermayer
2265bb93ff Merge remote-tracking branch 'qatar/master' 
* qatar/master:
  add support for Monkey's Audio versions from 3.93

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2013-03-15 13:43:01 +01:00
Michael Niedermayer
5be70f5826 Merge commit '9652d4fcfc9c07a726b35efc4ac644d9751b36d7' 
* commit '9652d4fcfc9c07a726b35efc4ac644d9751b36d7':
  ape: provide two additional bytes in buffer for old MAC versions

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2013-03-15 13:34:20 +01:00
Michael Niedermayer
231795270b Merge commit 'b164d66e35d349de414e2f0d7365a147aba8a620' 
* commit 'b164d66e35d349de414e2f0d7365a147aba8a620':
  ape: make version-dependent decoding functions called via pointers
  mpegts: add support for stream_type 0x42, which is CAVS

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2013-03-15 13:28:38 +01:00
Michael Niedermayer
9df00574fc Merge commit '3e175a2a550f5c2f788e8cd969052e10a5025a27' 
* commit '3e175a2a550f5c2f788e8cd969052e10a5025a27':
  avconv: mark attachment streams as immediately finished
  vaapi: fix argument for ff_vaapi_common_end_frame call

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2013-03-15 12:54:05 +01:00
Xi Wang
eba1ff3130 atrac3: avoid oversized shifting in decode_bytes() 
When `off' is 0, `0x537F6103 << 32' in the following expression invokes
undefined behavior, the result of which is not necessarily 0.

    (0x537F6103 >> (off * 8)) | (0x537F6103 << (32 - (off * 8)))

Avoid oversized shifting.

CC: libav-stable@libav.org

Signed-off-by: Xi Wang <xi.wang@gmail.com>
Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
 2013-03-15 12:51:10 +01:00
Kostya Shishkov
c42e262513 add support for Monkey's Audio versions from 3.93 2013-03-15 09:50:42 +01:00
Kostya Shishkov
9652d4fcfc ape: provide two additional bytes in buffer for old MAC versions 
Range coder in 3.90-3.95 overread two bytes in the final normalize.
 2013-03-15 09:50:42 +01:00
Kostya Shishkov
b164d66e35 ape: make version-dependent decoding functions called via pointers 
This will help in supporting old versions, e.g. version 3.93 uses the same
range coder but different predictor and version 3.82 uses different range
coder and predictor. Also this should not make decoding newer versions slower
by introducing additional checks on versions.
 2013-03-15 09:50:42 +01:00
Ronald S. Bultje
8a523cfa8b dsputil: remove non-8bpp draw_edge. 
It is never used.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-03-15 04:39:41 +01:00
Michael Niedermayer
46728338b0 rv34: export qp table 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-03-15 03:19:54 +01:00
Michael Niedermayer
feac79ce53 rv10: export qp table 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-03-15 03:16:23 +01:00
Michael Niedermayer
fa80967a73 mpeg1/2: export qp table 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-03-15 03:02:27 +01:00
Michael Niedermayer
ff9adf5725 mjpegdec: export qp table 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-03-15 03:02:27 +01:00
Michael Niedermayer
a0813e7f00 h263dec: export qp_table 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-03-15 03:02:27 +01:00
Michael Niedermayer
870e625108 mjpegdec: fix indention 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-03-14 17:31:14 +01:00
Michael Niedermayer
3c24fbbf65 jpegdec: be less picky on padding 
Fixes Ticket2353

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-03-14 17:20:44 +01:00
Janne Grunau
b066d90211 vaapi: fix argument for ff_vaapi_common_end_frame call 2013-03-14 15:16:08 +01:00
Ronald S. Bultje
b76d853697 lavc: make compilation of frame_thread_encoder.o optional. 
Only compile if CONFIG_ENCODERS is enabled, i.e. if at least one
encoder is to be compiled. This prevents it from being includes in
a decoder-only build.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-03-14 15:04:17 +01:00
Ronald S. Bultje
4a88d81c9e dsputil: remove duplicate or unused functions. 
dct_bits is never set except in h264, where it is never used, thus
remove it. Then, remove all functions that were set based on non-zero
(32) values for dct_bits. Lastly, merge 9-14 bpp functions for get_pixels
and draw_edge, which only care about pixel storage unit size, not actual
bits used (i.e. they don't clip).

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-03-14 14:56:48 +01:00
Hendrik Leppkes
49a514c13e dsputil: unbreak compilation on sparc after 6802c70 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-03-14 14:53:39 +01:00
Michael Niedermayer
cacbf64a76 Merge remote-tracking branch 'qatar/master' 
* qatar/master:
  avcodec: av_log_missing_feature(1) ---> avpriv_request_sample()

Conflicts:
	libavcodec/aacsbr.c
	libavcodec/amrnbdec.c
	libavcodec/takdec.c
	libavcodec/tta.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2013-03-14 13:07:25 +01:00
Michael Niedermayer
13795dbb64 Merge commit '6d97484d72e33f7dde9493a9ead1a72e2f029605' 
* commit '6d97484d72e33f7dde9493a9ead1a72e2f029605':
  avcodec: av_log_ask_for_sample() ---> avpriv_request_sample()
  rsodec: Use avpriv_report_missing_feature() where appropriate

Conflicts:
	libavcodec/anm.c
	libavcodec/mlpdec.c
	libavcodec/pictordec.c
	libavcodec/sunrast.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2013-03-14 12:52:12 +01:00
Michael Niedermayer
fa92ee821b Merge commit '63d744e2be39466e3a734c2987cd713e0bac101e' 
* commit '63d744e2be39466e3a734c2987cd713e0bac101e':
  av_log_missing_feature() ---> avpriv_report_missing_feature()

Conflicts:
	libavcodec/aacdec.c
	libavcodec/tta.c
	libavformat/mpegts.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2013-03-14 12:30:19 +01:00
Michael Niedermayer
905e7eb413 Merge commit 'f099d3d1d5466bd63f4ab36270d169ff9ea613b8' 
* commit 'f099d3d1d5466bd63f4ab36270d169ff9ea613b8':
  Add av_log_{ask_for_sample|missing_feature} replacements to libavutil
  ismindex: Check the return value of allocations

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2013-03-14 12:15:02 +01:00
Paul B Mahol
4853b5538f lavc: do not set coded_frame->reference 
That field is deprecated.

Signed-off-by: Paul B Mahol <onemda@gmail.com>
 2013-03-14 09:47:47 +00:00
Hendrik Leppkes
edcc51fb8e tiff: fix handling of metadata with refcounted frames 
Since the conversion to refcounted frames, the tiff decoder
only wrote the metadata into its internal "picture" in its own context,
never exposing the metadata to the user, and eventually leaking the
metadata.

Instead, properly store the metadata directly into the frame being decoded into.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-03-13 22:13:59 +01:00
Diego Biurrun
12e25ed284 avcodec: av_log_missing_feature(1) ---> avpriv_request_sample() 2013-03-13 21:20:12 +01:00
Diego Biurrun
6d97484d72 avcodec: av_log_ask_for_sample() ---> avpriv_request_sample() 2013-03-13 21:20:12 +01:00
Diego Biurrun
63d744e2be av_log_missing_feature() ---> avpriv_report_missing_feature() 2013-03-13 20:42:21 +01:00
Diego Biurrun
f099d3d1d5 Add av_log_{ask_for_sample|missing_feature} replacements to libavutil 
This allows reporting missing features and requesting samples from
all libraries in a standard way; with a simplified API.
 2013-03-13 20:42:06 +01:00
Hendrik Leppkes
84bf1cbef9 avcodec: remove AVCodecContext->metadata 
This field was only ever set and freed from avcodec, and not otherwise
used. However, because frames are refcounted now, avcodec cannot make any
assumptions about the lifetime of the frame metadata, which can result in
double-frees or leaked memory.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-03-13 20:16:48 +01:00
Clément Bœsch
20dab078e6 lavc/crystalhd: remove now unecessary buffer_hints. 2013-03-13 19:00:10 +01:00
Clément Bœsch
1ec94b0f06 lavc: factorize ff_{thread_,re,}get_buffer error messages. 
Coccinelle profile used:

  @@
  expression r, ctx, f, loglevel, str, flags;
  @@

  -if ((r = ff_get_buffer(ctx, f, flags)) < 0) {
  -    av_log(ctx, loglevel, str);
  -    return r;
  -}
  +if ((r = ff_get_buffer(ctx, f, flags)) < 0)
  +    return r;

  @@
  expression r, ctx, f, loglevel, str;
  @@

  -if ((r = ff_reget_buffer(ctx, f)) < 0) {
  -    av_log(ctx, loglevel, str);
  -    return r;
  -}
  +if ((r = ff_reget_buffer(ctx, f)) < 0)
  +    return r;

  @@
  expression r, ctx, f, loglevel, str, flags;
  @@

  -if ((r = ff_thread_get_buffer(ctx, f, flags)) < 0) {
  -    av_log(ctx, loglevel, str);
  -    return r;
  -}
  +if ((r = ff_thread_get_buffer(ctx, f, flags)) < 0)
  +    return r;

...along with some manual patches for the remaining ones.
 2013-03-13 19:00:10 +01:00
Hendrik Leppkes
9ae6ba2883 dsputil: remove deprecated dsp_mask usage 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-03-13 15:59:35 +01:00
Michael Niedermayer
c3bb2f7296 dsputil_mmx: remove unused variables 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-03-13 15:07:46 +01:00
Michael Niedermayer
7ff3bfd584 exr: silence warning "libavcodec/exr.c:351:9: warning: variable ret set but not used" 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-03-13 15:05:40 +01:00
Michael Niedermayer
c31f07574d Merge remote-tracking branch 'qatar/master' 
* qatar/master:
  hqdn3d: Fix out of array read in LOWPASS
  cabac: remove unused argument of ff_init_cabac_states()
  rawdec: fix a typo -- || instead of |

Conflicts:
	libavcodec/cabac.c
	libavcodec/h264.c
	libavfilter/vf_hqdn3d.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2013-03-13 14:49:00 +01:00
Michael Niedermayer
019b378d90 vc1: fix int/ptrdiff_t mismatches 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-03-13 14:35:48 +01:00
Michael Niedermayer
db4e4f766c Merge commit 'a8b6015823e628047a45916404c00044c5e80415' 
* commit 'a8b6015823e628047a45916404c00044c5e80415':
  dsputil: convert remaining functions to use ptrdiff_t strides

Conflicts:
	libavcodec/dsputil.h
	libavcodec/dsputil_template.c
	libavcodec/h264qpel_template.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2013-03-13 14:18:53 +01:00
Michael Niedermayer
849f015406 Merge commit 'a4472ac01e86f9fae5adb9034f2777b86a9c5480' 
* commit 'a4472ac01e86f9fae5adb9034f2777b86a9c5480':
  Add informative messages to av_log_ask_for_sample calls lacking them
  anm: Get rid of some very silly goto statements

Conflicts:
	libavformat/anm.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2013-03-13 14:03:22 +01:00
Michael Niedermayer
a62fced394 Merge commit '202c2acc40a6de8758b44ab3f5c85ab250079734' 
* commit '202c2acc40a6de8758b44ab3f5c85ab250079734':
  vda: remove async decoder leftovers

Conflicts:
	libavcodec/vda_h264.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2013-03-13 13:53:02 +01:00
Michael Niedermayer
bb3823d457 Merge commit 'a2816230c5c0a8fc72bc0163b7d21a96b194d87a' 
* commit 'a2816230c5c0a8fc72bc0163b7d21a96b194d87a':
  avframe: call release_buffer only if it is set

Conflicts:
	libavcodec/utils.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2013-03-13 13:45:50 +01:00
Michael Niedermayer
8ded1718bd Merge commit 'fce68c93554803801c32c1b20509bfa8d496b02a' 
* commit 'fce68c93554803801c32c1b20509bfa8d496b02a':
  pthread: unref the decoded but not returned frames on close.

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2013-03-13 13:39:44 +01:00
Michael Niedermayer
8bcebf9e4a Merge commit '555000c7d5c1e13043a948ebc48d2939b0ba6536' 
* commit '555000c7d5c1e13043a948ebc48d2939b0ba6536':
  h264: check that DPB is allocated before accessing it in flush_dpb()
  vf_hqdn3d: fix uninitialized variable use
  vf_gradfun: fix uninitialized variable use

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2013-03-13 13:34:06 +01:00
Michael Niedermayer
87d263a122 Merge commit 'c2597c5a0a08526493abb9bc9544b61a290fe20f' 
* commit 'c2597c5a0a08526493abb9bc9544b61a290fe20f':
  h264_refs: cosmetics, reformat

Conflicts:
	libavcodec/h264_refs.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2013-03-13 13:28:29 +01:00
Michael Niedermayer
6c3e4e391d Merge commit 'f08fefc4d099f2a1f2e3a6db3d340537e601f762' 
* commit 'f08fefc4d099f2a1f2e3a6db3d340537e601f762':
  h264: remove a useless svq3 condition
  mpegvideo: remove FMT_H264

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2013-03-13 13:17:49 +01:00
Michael Niedermayer
df4517106a Merge commit 'ee8704916de79158da8a48a9ea5be819e83d23ba' 
* commit 'ee8704916de79158da8a48a9ea5be819e83d23ba':
  mpegvideo: reindent

Conflicts:
	libavcodec/mpegvideo.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2013-03-13 13:08:04 +01:00
Michael Niedermayer
f45fdb123f Merge commit '19cac8e301419dcde31526d15196a952ddf2c4c7' 
* commit '19cac8e301419dcde31526d15196a952ddf2c4c7':
  mpegvideo: remove useless references to h264 and svq3

Conflicts:
	libavcodec/mpegvideo.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2013-03-13 12:56:43 +01:00
Paul B Mahol
ac45921a6b lavc: remove disabled 8SVX_RAW cruft 
Signed-off-by: Paul B Mahol <onemda@gmail.com>
 2013-03-13 11:17:09 +00:00
Michael Niedermayer
b13cd2d867 Merge commit 'd6ed604cf4ca86ed345125b26eb5bdeea6d6bf68' 
* commit 'd6ed604cf4ca86ed345125b26eb5bdeea6d6bf68':
  lavc: remove disabled FF_API_IDCT cruft

Conflicts:
	libavcodec/version.h

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2013-03-13 12:03:22 +01:00
Michael Niedermayer
feccf2f6b7 Merge commit '3bcdf8dcb9891ffe49b6398d0e2c02f1712d8f00' 
* commit '3bcdf8dcb9891ffe49b6398d0e2c02f1712d8f00':
  lavc: remove disabled FF_API_SNOW cruft

Conflicts:
	libavcodec/avcodec.h
	libavcodec/options_table.h
	libavcodec/version.h

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2013-03-13 11:53:57 +01:00
Janne Grunau
91d4823f70 avpacket: copy side data type and size in av_dup_packet 2013-03-13 11:34:47 +01:00
Michael Niedermayer
5753e34906 Merge commit 'fcb07e8b332bbd6f9558bff98ff5102c5f2d8252' 
* commit 'fcb07e8b332bbd6f9558bff98ff5102c5f2d8252':
  lavc: remove disabled FF_API_MMI cruft

Conflicts:
	libavcodec/version.h

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2013-03-13 11:29:04 +01:00
Michael Niedermayer
a8c0777325 Revert "Merge commit '0517c9e098092709397cc522c59fa63c83cc81be'" bring the old audio resampling API back 
This reverts commit d3edc65dd1, reversing
changes made to 150de78d7c.

Conflicts:

	libavcodec/version.h

It seems there are several applications still using it

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-03-13 10:57:00 +01:00
Michael Niedermayer
bbaa4432e2 vc1dec: remove unused variables 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-03-13 10:51:53 +01:00
Philip Langdale
21dc9b194f CrystalHD: Port to ref-counted frame API. 
Signed-off-by: Philip Langdale <philipl@overt.org>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-03-13 10:42:34 +01:00
Michael Niedermayer
0fe4b48540 cabac: remove unused argument of ff_init_cabac_states() 
Signed-off-by: Anton Khirnov <anton@khirnov.net>
 2013-03-13 09:14:05 +01:00
Nicolas George
be40d6cc2b rawdec: fix a typo -- || instead of | 
Signed-off-by: Anton Khirnov <anton@khirnov.net>
 2013-03-13 09:13:54 +01:00
Michael Niedermayer
12fe78a77b vp56: remove unused variable 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-03-13 04:12:14 +01:00
Ronald S. Bultje
f536df99fe dsputil: remove hpel functions (moved to hpeldsp). 2013-03-13 04:11:41 +01:00
Ronald S. Bultje
94b77678dc Move alpha half-pel assembly from dsputil to hpeldsp. 2013-03-13 04:11:27 +01:00
Ronald S. Bultje
6802c70106 Move sparc/vis half-pel assembly from dsputil to hpeldsp. 2013-03-13 04:09:43 +01:00
Michael Niedermayer
a0565a2b65 Move sh4 half-pel assembly from dsputil to hpeldsp. 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-03-13 04:07:41 +01:00
Ronald S. Bultje
e9e608ad58 Move bfin half-pel assembly from dsputil to hpeldsp. 2013-03-13 04:06:10 +01:00
Ronald S. Bultje
de99545f46 Move arm half-pel assembly from dsputil to hpeldsp. 2013-03-13 04:04:13 +01:00
Ronald S. Bultje
89f16ded9b Move ppc half-pel assembly from dsputil to hpeldsp. 2013-03-13 04:02:30 +01:00
Ronald S. Bultje
3ced55d51c Move x86 half-pel assembly from dsputil to hpeldsp. 2013-03-13 03:59:23 +01:00
Ronald S. Bultje
e0a8f31591 mjpeg: use hpeldsp instead of dsputil for half-pel functions. 2013-03-13 03:59:10 +01:00
Ronald S. Bultje
b42d594c85 svq1enc: use hpeldsp instead of dsputil for half-pel functions. 2013-03-13 03:59:00 +01:00
Ronald S. Bultje
771ba8f206 snow: use hpeldsp instead of dsputil for half-pel functions. 2013-03-13 03:58:49 +01:00
Ronald S. Bultje
05dd583426 svq3: use hpeldsp instead of dsputil for half-pel functions. 2013-03-13 03:58:31 +01:00
Ronald S. Bultje
4ba5dbc0e4 mpegvideo: use hpeldsp instead of dsputil for half-pel functions. 
This also converts vc1, since that is mpegvideo-based.
 2013-03-13 03:58:00 +01:00
Ronald S. Bultje
4652389777 svq1: use hpeldsp instead of dsputil for half-pel functions. 
This makes svq1 independent of dsputil.
 2013-03-13 03:57:45 +01:00
Ronald S. Bultje
cc5d17e026 mimic: use hpeldsp instead of dsputil for half-pel functions. 2013-03-13 03:57:33 +01:00
Ronald S. Bultje
04a75bb74f interplayvideo: use hpeldsp instead of dsputil for half-pel functions. 
This makes interplayvideo independent of dsputil.
 2013-03-13 03:57:21 +01:00
Ronald S. Bultje
af1e3dfb9e bink: use hpeldsp instead of dsputil for half-pel functions. 2013-03-13 03:56:09 +01:00
Ronald S. Bultje
4b642ab19b indeo3: use hpeldsp instead of dsputil for half-pel functions. 
This makes indeo3 independent of dsputil.
 2013-03-13 03:56:09 +01:00
Ronald S. Bultje
704c9874a3 vp56: use hpeldsp instead of dsputil for half-pel functions. 
This makes vp5 and vp6 independent of dsputil.
 2013-03-13 03:56:07 +01:00
Ronald S. Bultje
d1293512cf vp3: use hpeldsp instead of dsputil for half-pel functions. 
This makes vp3 independent of dsputil.
 2013-03-13 03:55:33 +01:00
Ronald S. Bultje
9628e5a4ac hpeldsp: add half-pel functions (currently copies of dsputil). 2013-03-13 03:54:47 +01:00
Michael Niedermayer
1f27053b91 Merge commit 'de27d2b92fa97deb2856d18e9f5f19586ce45a0f' 
* commit 'de27d2b92fa97deb2856d18e9f5f19586ce45a0f':
  lavc: remove disabled FF_API_LIBMPEG2 cruft

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

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2013-03-13 02:56:33 +01:00
Michael Niedermayer
d3edc65dd1 Merge commit '0517c9e098092709397cc522c59fa63c83cc81be' 
* commit '0517c9e098092709397cc522c59fa63c83cc81be':
  lavc: remove disabled FF_API_AVCODEC_RESAMPLE cruft

Conflicts:
	libavcodec/Makefile
	libavcodec/avcodec.h
	libavcodec/resample.c
	libavcodec/resample2.c
	libavcodec/version.h

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2013-03-13 02:41:18 +01:00
Michael Niedermayer
e5949cc12a Merge commit '684e3d2e1ce96625eeef63f2564aab66f6715d05' 
* commit '684e3d2e1ce96625eeef63f2564aab66f6715d05':
  ra144: check buffer size before requesting a buffer
  wmapro: unref skipped frames

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2013-03-13 02:02:06 +01:00
Michael Niedermayer
ff3e8564c4 Merge commit 'e3232f34312f8187094c875445683277ed0c209d' 
* commit 'e3232f34312f8187094c875445683277ed0c209d':
  svq1: use av_frame_free to free refcounted frame
  lavc: fix get_buffer() compatibility layer for audio.

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2013-03-13 01:56:41 +01:00
Michael Niedermayer
047c5e177a Merge commit '98cec5c84feff34e04428de4a86836a83657ae5e' 
* commit '98cec5c84feff34e04428de4a86836a83657ae5e':
  ratecontrol: remove an unused variable
  vorbisdec: do not leak the first frame.
  vf_pad: fix a & instead of && typo

Conflicts:
	libavfilter/vf_pad.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2013-03-13 01:47:39 +01:00
Clément Bœsch
02a6b06d9e avpacket: do not copy data when buf ref is available. 
This at least fixes issues with lavf/subtitles. The behaviour of
av_dup_packet() is unchanged, only av_copy_packet() is affected.
 2013-03-13 01:30:20 +01:00
Michael Niedermayer
d469fa1923 Merge commit 'adfa53d67c7a3318157ea9d95e8bdcfb77139452' 
* commit 'adfa53d67c7a3318157ea9d95e8bdcfb77139452':
  lavc: remove disabled FF_API_VDA_ASYNC cruft

Conflicts:
	libavcodec/vda.h
	libavcodec/vda_h264.c
	libavcodec/version.h

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2013-03-13 01:14:09 +01:00
Michael Niedermayer
cfc1efc77c avcodec: assert that old codec ids match new 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-03-13 00:50:48 +01:00
Michael Niedermayer
e664f48b97 Merge commit 'bdd1567c355a8092e7746ef99e831d579e34fa6a' 
* commit 'bdd1567c355a8092e7746ef99e831d579e34fa6a':
  lavc: remove disabled FF_API_CODEC_ID cruft

Conflicts:
	libavcodec/old_codec_ids.h
	libavcodec/version.h

Only the #define is removed
The CODEC_IDs itself are left until theres some reason to remove
them.

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2013-03-13 00:49:25 +01:00
Stefano Sabatini
92ca292766 lavc: extend documentation for skip_idct, skip_loop_filter, skip_frame options 2013-03-13 00:34:42 +01:00
Michael Niedermayer
f7b041b11b Merge commit '7d42fd6bb9df99a20cf2d0d0e3b166a83a649d08' 
* commit '7d42fd6bb9df99a20cf2d0d0e3b166a83a649d08':
  lavc: remove disabled FF_API_FIND_BEST_PIX_FMT cruft

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

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2013-03-12 23:08:08 +01:00
Ronald S. Bultje
d85c9b036e vp3/x86: use full transpose for all IDCTs. 
This way, the special IDCT permutations are no longer needed. Bfin code
is disabled until someone updates it. This is similar to how H264 does
it, and removes the dsputil dependency imposed by the scantable code.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-03-12 22:54:10 +01:00
Michael Niedermayer
db594f65ec Merge commit '845017105f240ac5348aad1f8a5256b86d49db76' 
* commit '845017105f240ac5348aad1f8a5256b86d49db76':
  lavc: remove disabled FF_API_DSP_MASK cruft
  lavc: remove disabled FF_API_SUB_ID cruft

Conflicts:
	libavcodec/options_table.h
	libavcodec/version.h

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2013-03-12 22:38:55 +01:00
Michael Niedermayer
5beddbc4cf Merge commit '2a113695238e7675ab75c5fb9a5f59fc92f2ddd9' 
* commit '2a113695238e7675ab75c5fb9a5f59fc92f2ddd9':
  lavc: remove disabled FF_API_INTER_THRESHOLD cruft
  lavc: remove disabled FF_API_COLOR_TABLE_ID cruft
  lavc: remove disabled FF_API_MPV_GLOBAL_OPTS cruft

Conflicts:
	libavcodec/version.h

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2013-03-12 22:18:08 +01:00
Michael Niedermayer
e052f06531 Merge commit '0f24a3ca999a702f83af9307f9f47b6fdeb546a5' 
* commit '0f24a3ca999a702f83af9307f9f47b6fdeb546a5':
  lavc: remove disabled FF_API_OLD_ENCODE_VIDEO cruft
  lavc: remove disabled FF_API_OLD_ENCODE_AUDIO cruft
  lavc: remove disabled FF_API_OLD_DECODE_AUDIO cruft

Conflicts:
	libavcodec/flacenc.c
	libavcodec/libgsm.c
	libavcodec/utils.c
	libavcodec/version.h

The compatibility wrapers are left as they likely sre still
in wide use. They will be removed when they break or otherwise
cause work without an volunteer being available.

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2013-03-12 22:04:16 +01:00
Michael Niedermayer
eba6a04e1c vp6: remove unused variable 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-03-12 21:46:38 +01:00
Michael Niedermayer
0d0f76ea56 Merge commit '6327c10702922eabcb1c6170abd3f03d23ce4c51' 
* commit '6327c10702922eabcb1c6170abd3f03d23ce4c51':
  atomic: fix CAS with armcc.
  png: use av_mallocz_array() for the zlib zalloc function
  libmp3lame: use the correct remaining buffer size when flushing

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2013-03-12 21:39:38 +01:00
Hendrik Leppkes
cde1e7db3e vorbis: unref the skipped first frame. 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-03-12 20:46:55 +01:00
Ronald S. Bultje
6a701306db dsputil: make selectable. 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-03-12 19:56:58 +01:00
Michael Niedermayer
19688e87e5 h264: show recovery SEIs in debug output 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-03-12 18:43:17 +01:00
Michael Niedermayer
dc7ba0c1f4 j2kdec: remove unused variable and empty function 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-03-12 18:30:59 +01:00
Luca Barbato
a8b6015823 dsputil: convert remaining functions to use ptrdiff_t strides 
Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
 2013-03-12 18:26:42 +01:00
Hendrik Leppkes
f91730a16b jv: initialize AVFrame 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-03-12 18:24:49 +01:00
Michael Niedermayer
6b6b0e9dae pthread: fix unused variable warning 2013-03-12 18:10:09 +01:00
Michael Niedermayer
7093b7534f Merge commit '2240e92f052960693de55cf4924e80426dfaa965' 
* commit '2240e92f052960693de55cf4924e80426dfaa965':
  atomic: Add include guards to the implementation headers
  lavc: update the fallback versions of ff_thread_*

Conflicts:
	libavcodec/utils.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2013-03-12 16:36:21 +01:00
Michael Niedermayer
bf780b7ea8 Merge commit '19dd4017ab6dac11c77d797acebee4f60ad63a6f' 
* commit '19dd4017ab6dac11c77d797acebee4f60ad63a6f':
  libopencore-amr: Add the missing 3rd argument of ff_get_buffer()
  vmdaudio: fix invalid reads when packet size is not a multiple of chunk size
  wmaprodec: return an error, not 0, when the input is too small.

Conflicts:
	libavcodec/vmdav.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2013-03-12 16:31:21 +01:00
Michael Niedermayer
7787a6c7ca Merge commit 'cacad1c058f66558ec727faac3b277d2dee264d4' 
* commit 'cacad1c058f66558ec727faac3b277d2dee264d4':
  wmaprodec: require block_align to be set.
  wmadec: require block_align to be set.
  ivi_common: do not call MC for intra frames when dc_transform is unset

Conflicts:
	libavcodec/ivi_common.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2013-03-12 16:15:08 +01:00
Michael Niedermayer
6ec0447d3d xface: remove unused stuff, fix related warnings 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-03-12 16:04:46 +01:00
Michael Niedermayer
b36095ea0f Merge commit '3e2f200237af977b9253b0aff121eee27bcedb44' 
* commit '3e2f200237af977b9253b0aff121eee27bcedb44':
  roqvideodec: fix a potential infinite loop in roqvideo_decode_frame().
  xxan: fix invalid memory access in xan_decode_frame_type0()
  tty: set avg_frame_rate.
  FATE: enable multiple slices in the ffv1 vsynth test

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2013-03-12 15:57:28 +01:00
Michael Niedermayer
0cfbfaaa12 Merge commit '7b89cd20d844cbe763ca34e63e99d110043cf241' 
* commit '7b89cd20d844cbe763ca34e63e99d110043cf241':
  eamad: allocate a dummy reference frame when the real one is missing
  Replace remaining includes of audioconvert.h with channel_layout.h
  Replace some forgotten instances of PIX_FMT_* with AV_PIX_FMT_*.

Conflicts:
	libavcodec/h264.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2013-03-12 15:44:15 +01:00
Michael Niedermayer
a75f01d7e0 Merge commit 'd8b31be6caebd8d1321ecb754b6e7daaf81dc111' 
* commit 'd8b31be6caebd8d1321ecb754b6e7daaf81dc111':
  Add the bumps and APIchanges entries for reference counted buffers changes.

Conflicts:
	Changelog
	doc/APIchanges
	libavcodec/version.h
	libavdevice/version.h
	libavfilter/version.h
	libavformat/version.h

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2013-03-12 15:35:39 +01:00
Michael Niedermayer
ad78b9ed70 avcodec: postpone removial of parts still used 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-03-12 15:28:21 +01:00
Michael Niedermayer
b2cd0d709a Merge commit '8df23e938b4022d6e6e9e1180ea6418abae74fda' 
* commit '8df23e938b4022d6e6e9e1180ea6418abae74fda':
  lavc: postpone the removal of request_channels API.
  AVFrame: deprecate all now unused fields

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2013-03-12 14:46:41 +01:00
Michael Niedermayer
dac8799529 Merge commit 'ddcca4ba074aa537c3059c76d69eb4ad6316bfe9' 
* commit 'ddcca4ba074aa537c3059c76d69eb4ad6316bfe9':
  lavc: stop setting AVFrame.motion_subsample_log2
  avserver: don't set deprecated options.

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2013-03-12 14:27:54 +01:00
Michael Niedermayer
3c1326411d Merge commit '37045e422903695e610cca6ecb753df643ab9380' 
* commit '37045e422903695e610cca6ecb753df643ab9380':
  mpegvideo: drop vismv code

Conflicts:
	libavcodec/mpegvideo.c

vismv code works fine, and thus only the unused fields are droped

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2013-03-12 12:57:54 +01:00
Michael Niedermayer
a303dce28c utils: Dont sent fake channel layouts, 0 layout is better when its not known 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-03-12 12:50:07 +01:00
Michael Niedermayer
f9fd6f983b Merge commit '2eba9087f3031c6050f8dcd996225490be6c2410' 
* commit '2eba9087f3031c6050f8dcd996225490be6c2410':
  lavc: make up a fake frame channel layout when there is no real one.

Conflicts:
	libavcodec/utils.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2013-03-12 12:49:59 +01:00
Michael Niedermayer
a7f9d92a6d Merge commit '192f1984b1a93aa08af053b8f9ab4950f307bd5d' 
* commit '192f1984b1a93aa08af053b8f9ab4950f307bd5d':
  lavc: limit maximum number of channels to 63

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2013-03-12 12:23:12 +01:00
Michael Niedermayer
36685c3c4b Merge commit '15ec0450b4ae891f3e6ababa03c777a4443b94ca' 
* commit '15ec0450b4ae891f3e6ababa03c777a4443b94ca':
  lavc: allow decoders to override frame parameters.

Conflicts:
	libavcodec/utils.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2013-03-12 12:18:31 +01:00
Michael Niedermayer
64d11cb615 mss1: set frame defaults 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-03-12 12:17:58 +01:00
Michael Niedermayer
53fd4f5594 avcodec: fix motion vector vissualization 
was broken by the buffer ref stuff

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-03-12 11:23:07 +01:00
Diego Biurrun
a4472ac01e Add informative messages to av_log_ask_for_sample calls lacking them 2013-03-12 11:09:45 +01:00
Michael Niedermayer
6ae4372532 h264/mpegvideo: fix ff_print_debug_info2 arguments 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-03-12 11:06:35 +01:00
Michael Niedermayer
a76ef998eb mpegvideo: move ff_print_debug_info2 to where ff_print_debug_info is 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-03-12 10:51:03 +01:00
Michael Niedermayer
c536253854 snow: set frame defaults 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-03-12 10:35:51 +01:00
Michael Niedermayer
b5e5ed8ea7 Merge commit '3b199d29cd597a3518136d78860e172060b9e83d' 
* commit '3b199d29cd597a3518136d78860e172060b9e83d':
  lavc decoders: properly initialize AVFrame.

Conflicts:
	libavcodec/avs.c
	libavcodec/c93.c
	libavcodec/cinepak.c
	libavcodec/flashsv.c
	libavcodec/flicvideo.c
	libavcodec/iff.c
	libavcodec/mmvideo.c
	libavcodec/msrle.c
	libavcodec/msvideo1.c
	libavcodec/qtrle.c
	libavcodec/rpza.c
	libavcodec/smacker.c
	libavcodec/smc.c
	libavcodec/tiertexseqv.c
	libavcodec/truemotion1.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2013-03-12 03:54:40 +01:00
Michael Niedermayer
01a0283c92 h264: disallow single unpaired fields as references of frames 
Fixes deadlock
 2013-03-12 03:23:58 +01:00
Michael Niedermayer
0fc01ae33c h264: fix null pointer dereference and assertion failure 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-03-12 03:23:56 +01:00
Michael Niedermayer
ee3c3dd523 ff_alloc_picture: free tables in case of dimension mismatches 
Fixes memory corruption
In theory this should not be needed but its better to check at
one place than to hope 50 other places set the flags correctly
 2013-03-12 03:23:55 +01:00
Michael Niedermayer
9e73f6d1f9 mpegvideo: dont allow last == current 
this fixes deadlocks

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-03-12 03:23:53 +01:00
Michael Niedermayer
9dd0b7ad82 update_frame_pool: use channel field 
Fix memory corruption

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-03-12 03:23:51 +01:00
Michael Niedermayer
80e9e63c94 Merge commit '759001c534287a96dc96d1e274665feb7059145d' 
* commit '759001c534287a96dc96d1e274665feb7059145d':
  lavc decoders: work with refcounted frames.

Anton Khirnov (1):
      lavc decoders: work with refcounted frames.

Clément Bœsch (47):
      lavc/ansi: reset file
      lavc/ansi: re-do refcounted frame changes from Anton
      fraps: reset file
      lavc/fraps: switch to refcounted frames
      gifdec: reset file
      lavc/gifdec: switch to refcounted frames
      dsicinav: resolve conflicts
      smc: resolve conflicts
      zmbv: resolve conflicts
      rpza: resolve conflicts
      vble: resolve conflicts
      xxan: resolve conflicts
      targa: resolve conflicts
      vmnc: resolve conflicts
      utvideodec: resolve conflicts
      tscc: resolve conflicts
      ulti: resolve conflicts
      ffv1dec: resolve conflicts
      dnxhddec: resolve conflicts
      v210dec: resolve conflicts
      vp3: resolve conflicts
      vcr1: resolve conflicts
      v210x: resolve conflicts
      wavpack: resolve conflicts
      pngdec: fix compilation
      roqvideodec: resolve conflicts
      pictordec: resolve conflicts
      mdec: resolve conflicts
      tiertexseqv: resolve conflicts
      smacker: resolve conflicts
      vb: resolve conflicts
      vqavideo: resolve conflicts
      xl: resolve conflicts
      tmv: resolve conflicts
      vmdav: resolve conflicts
      truemotion1: resolve conflicts
      truemotion2: resolve conflicts
      lcldec: fix compilation
      libcelt_dec: fix compilation
      qdrw: fix compilation
      r210dec: fix compilation
      rl2: fix compilation
      wnv1: fix compilation
      yop: fix compilation
      tiff: resolve conflicts
      interplayvideo: fix compilation
      qpeg: resolve conflicts (FIXME/TESTME).

Hendrik Leppkes (33):
      012v: convert to refcounted frames
      8bps: fix compilation
      8svx: resolve conflicts
      4xm: resolve conflicts
      aasc: resolve conflicts
      bfi: fix compilation
      aura: fix compilation
      alsdec: resolve conflicts
      avrndec: convert to refcounted frames
      avuidec: convert to refcounted frames
      bintext: convert to refcounted frames
      cavsdec: resolve conflicts
      brender_pix: convert to refcounted frames
      cinepak: resolve conflicts
      cinepak: avoid using AVFrame struct directly in private context
      cljr: fix compilation
      cpia: convert to refcounted frames
      cscd: resolve conflicts
      iff: resolve conflicts and do proper conversion to refcounted frames
      4xm: fix reference frame handling
      cyuv: fix compilation
      dxa: fix compilation
      eacmv: fix compilation
      eamad: fix compilation
      eatgv: fix compilation
      escape124: remove unused variable.
      escape130: convert to refcounted frames
      evrcdec: convert to refcounted frames
      exr: convert to refcounted frames
      mvcdec: convert to refcounted frames
      paf: properly free the frame data on decode close
      sgirle: convert to refcounted frames
      lavfi/moviesrc: use refcounted frames

Michael Niedermayer (56):
      Merge commit '759001c534287a96dc96d1e274665feb7059145d'
      resolve conflicts in headers
      motion_est: resolve conflict
      mpeg4videodec: fix conflicts
      dpcm conflict fix
      dpx: fix conflicts
      indeo3: resolve confilcts
      kmvc: resolve conflicts
      kmvc: resolve conflicts
      h264: resolve conflicts
      utils: resolve conflicts
      rawdec: resolve conflcits
      mpegvideo: resolve conflicts
      svq1enc: resolve conflicts
      mpegvideo: dont clear data, fix assertion failure on fate vsynth1 with threads
      pthreads: resolve conflicts
      frame_thread_encoder: simple compilefix not yet tested
      snow: update to buffer refs
      crytsalhd: fix compile
      dirac: switch to new API
      sonic: update to new API
      svq1: resolve conflict, update to new API
      ffwavesynth: update to new buffer API
      g729: update to new API
      indeo5: fix compile
      j2kdec: update to new buffer API
      linopencore-amr: fix compile
      libvorbisdec: update to new API
      loco: fix compile
      paf: update to new API
      proresdec: update to new API
      vp56: update to new api / resolve conflicts
      xface: convert to refcounted frames
      xan: fix compile&fate
      v408: update to ref counted buffers
      v308: update to ref counted buffers
      yuv4dec: update to ref counted buffers
      y41p: update to ref counted frames
      xbm: update to refcounted frames
      targa_y216: update to refcounted buffers
      qpeg: fix fate/crash
      cdxl: fix fate
      tscc: fix reget buffer useage
      targa_y216dec: fix style
      msmpeg4: fix fate
      h264: ref_picture() copy fields that have been lost too
      update_frame_pool: use channel field
      h264: Put code that prevents deadlocks back
      mpegvideo: dont allow last == current
      wmalossless: fix buffer ref messup
      ff_alloc_picture: free tables in case of dimension mismatches
      h264: fix null pointer dereference and assertion failure
      frame_thread_encoder: update to bufrefs
      ec: fix used arrays
      snowdec: fix off by 1 error in dimensions check
      h264: disallow single unpaired fields as references of frames

Paul B Mahol (2):
      lavc/vima: convert to refcounted frames
      sanm: convert to refcounted frames

Conflicts:
	libavcodec/4xm.c
	libavcodec/8bps.c
	libavcodec/8svx.c
	libavcodec/aasc.c
	libavcodec/alsdec.c
	libavcodec/anm.c
	libavcodec/ansi.c
	libavcodec/avs.c
	libavcodec/bethsoftvideo.c
	libavcodec/bfi.c
	libavcodec/c93.c
	libavcodec/cavsdec.c
	libavcodec/cdgraphics.c
	libavcodec/cinepak.c
	libavcodec/cljr.c
	libavcodec/cscd.c
	libavcodec/dnxhddec.c
	libavcodec/dpcm.c
	libavcodec/dpx.c
	libavcodec/dsicinav.c
	libavcodec/dvdec.c
	libavcodec/dxa.c
	libavcodec/eacmv.c
	libavcodec/eamad.c
	libavcodec/eatgq.c
	libavcodec/eatgv.c
	libavcodec/eatqi.c
	libavcodec/error_resilience.c
	libavcodec/escape124.c
	libavcodec/ffv1.h
	libavcodec/ffv1dec.c
	libavcodec/flicvideo.c
	libavcodec/fraps.c
	libavcodec/frwu.c
	libavcodec/g723_1.c
	libavcodec/gifdec.c
	libavcodec/h264.c
	libavcodec/h264.h
	libavcodec/h264_direct.c
	libavcodec/h264_loopfilter.c
	libavcodec/h264_refs.c
	libavcodec/huffyuvdec.c
	libavcodec/idcinvideo.c
	libavcodec/iff.c
	libavcodec/indeo2.c
	libavcodec/indeo3.c
	libavcodec/internal.h
	libavcodec/interplayvideo.c
	libavcodec/ivi_common.c
	libavcodec/jvdec.c
	libavcodec/kgv1dec.c
	libavcodec/kmvc.c
	libavcodec/lagarith.c
	libavcodec/libopenjpegdec.c
	libavcodec/mdec.c
	libavcodec/mimic.c
	libavcodec/mjpegbdec.c
	libavcodec/mjpegdec.c
	libavcodec/mmvideo.c
	libavcodec/motion_est.c
	libavcodec/motionpixels.c
	libavcodec/mpc7.c
	libavcodec/mpeg12.c
	libavcodec/mpeg4videodec.c
	libavcodec/mpegvideo.c
	libavcodec/mpegvideo.h
	libavcodec/msrle.c
	libavcodec/msvideo1.c
	libavcodec/nuv.c
	libavcodec/options_table.h
	libavcodec/pcx.c
	libavcodec/pictordec.c
	libavcodec/pngdec.c
	libavcodec/pnmdec.c
	libavcodec/pthread.c
	libavcodec/qpeg.c
	libavcodec/qtrle.c
	libavcodec/r210dec.c
	libavcodec/rawdec.c
	libavcodec/roqvideodec.c
	libavcodec/rpza.c
	libavcodec/smacker.c
	libavcodec/smc.c
	libavcodec/svq1dec.c
	libavcodec/svq1enc.c
	libavcodec/targa.c
	libavcodec/tiertexseqv.c
	libavcodec/tiff.c
	libavcodec/tmv.c
	libavcodec/truemotion1.c
	libavcodec/truemotion2.c
	libavcodec/tscc.c
	libavcodec/ulti.c
	libavcodec/utils.c
	libavcodec/utvideodec.c
	libavcodec/v210dec.c
	libavcodec/v210x.c
	libavcodec/vb.c
	libavcodec/vble.c
	libavcodec/vcr1.c
	libavcodec/vmdav.c
	libavcodec/vmnc.c
	libavcodec/vp3.c
	libavcodec/vp56.c
	libavcodec/vp56.h
	libavcodec/vp6.c
	libavcodec/vqavideo.c
	libavcodec/wavpack.c
	libavcodec/xl.c
	libavcodec/xxan.c
	libavcodec/zmbv.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2013-03-12 03:23:28 +01:00
Michael Niedermayer
2e7bc9c2a1 snowdec: fix off by 1 error in dimensions check 
fixes infinite loop

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-03-12 02:42:50 +01:00
Luca Barbato
202c2acc40 vda: remove async decoder leftovers 
Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
 2013-03-12 01:05:48 +01:00
Janne Grunau
a2816230c5 avframe: call release_buffer only if it is set 
AVCodecContext release_buffer() shall be NULL for audio codecs using
get_buffer. The backward compatibility code hence have to check before
calling it.
 2013-03-11 18:58:47 +01:00
Anton Khirnov
fce68c9355 pthread: unref the decoded but not returned frames on close. 
Fixes memleaks when frame mt is used and the decoder is not flushed at
the end.
 2013-03-11 18:30:35 +01:00
Anton Khirnov
555000c7d5 h264: check that DPB is allocated before accessing it in flush_dpb() 2013-03-11 18:30:31 +01:00
Anton Khirnov
c2597c5a0a h264_refs: cosmetics, reformat 2013-03-11 18:24:56 +01:00
Anton Khirnov
f08fefc4d0 h264: remove a useless svq3 condition 
The svq3 decoder does not call ff_h264_frame_start() anymore.
 2013-03-11 18:24:36 +01:00
Anton Khirnov
07054015cf mpegvideo: remove FMT_H264 2013-03-11 18:24:25 +01:00
Anton Khirnov
ee8704916d mpegvideo: reindent 2013-03-11 18:24:16 +01:00
Anton Khirnov
19cac8e301 mpegvideo: remove useless references to h264 and svq3 
The h264 decoder does not use mpegvideo anymore. The svq3 decoder only
uses ff_draw_horiz_band().
 2013-03-11 18:24:06 +01:00
Anton Khirnov
d6ed604cf4 lavc: remove disabled FF_API_IDCT cruft 2013-03-11 18:22:37 +01:00
Anton Khirnov
3bcdf8dcb9 lavc: remove disabled FF_API_SNOW cruft 2013-03-11 18:22:26 +01:00
Anton Khirnov
fcb07e8b33 lavc: remove disabled FF_API_MMI cruft 2013-03-11 18:22:18 +01:00
Anton Khirnov
de27d2b92f lavc: remove disabled FF_API_LIBMPEG2 cruft 2013-03-11 18:21:54 +01:00
Anton Khirnov
0517c9e098 lavc: remove disabled FF_API_AVCODEC_RESAMPLE cruft 2013-03-11 18:21:32 +01:00
Janne Grunau
684e3d2e1c ra144: check buffer size before requesting a buffer 
Return an error on incomplete frames.
 2013-03-10 22:34:43 +01:00
Janne Grunau
08149b2b39 wmapro: unref skipped frames 2013-03-10 22:34:43 +01:00
Janne Grunau
e3232f3431 svq1: use av_frame_free to free refcounted frame 
Fixes a memleak due to avcodec_free_frame not freeing the frame data.
 2013-03-10 22:28:18 +01:00
Anton Khirnov
98cec5c84f ratecontrol: remove an unused variable 2013-03-10 22:19:52 +01:00
Anton Khirnov
669cc0f364 lavc: fix get_buffer() compatibility layer for audio. 
planes - FF_ARRAY_ELEMS would be evaluated as unsigned and underflow
instead of being negative as was intended.
 2013-03-10 22:19:52 +01:00
Anton Khirnov
e2c2974120 vorbisdec: do not leak the first frame. 2013-03-10 22:16:26 +01:00
Stefano Sabatini
dae76e8c47 lavc/utils: fix typo and reword message in case of too low bitrate 2013-03-10 13:22:58 +01:00
Ronald S. Bultje
d5efa84f13 vp3: embed idct_permutation array directly in VP3DecoderContext. 
This makes the vp3 decoder less dependent on dsputil, and will aid
in making it (eventually) dsputil-independent.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-03-10 02:51:05 +01:00
Michael Niedermayer
4a62f477ea Merge commit '6e7b50b4270116ded8b874d76cb7c5b1a0341827' 
* commit '6e7b50b4270116ded8b874d76cb7c5b1a0341827':
  mpegvideo_enc: drop support for reusing the input motion vectors.

Conflicts:
	libavcodec/motion_est.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2013-03-10 02:10:43 +01:00
Nicolas George
9cc02101ff lavc/rawdec: set field order on decoded frame. 2013-03-10 01:41:49 +01:00
Nicolas George
6184fa2067 rawdec: work with refcounted frames. 
Adapted from commit 759001c534
by Anton Khirnov.

Also, fix the use of || instead of | in a flags check.
 2013-03-10 01:41:48 +01:00
Ronald S. Bultje
22cc8a103c x86/qpel: move fullpel and l2 functions to separate file. 
This way, they can be shared between mpeg4qpel and h264qpel without
requiring either one to be compiled unconditionally.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-03-09 17:25:30 +01:00
Ronald S. Bultje
9d40f7106d dsputil: make square put/avg_pixels functions local to h264qpel. 
Put a copy of the 8bit functions only in dsputil, where they are used
for some other things (e.g. mpeg4qpel, mspel, cavsqpel). We could perhaps
also try to share specifically the 8bit functions from h264qpel between
it and the others, but that will be slightly more complicated. H264qpel
already had these functions, so we can simply remove the duplicates.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-03-09 17:16:55 +01:00
Anton Khirnov
adfa53d67c lavc: remove disabled FF_API_VDA_ASYNC cruft 2013-03-09 08:37:11 +01:00
Anton Khirnov
bdd1567c35 lavc: remove disabled FF_API_CODEC_ID cruft 2013-03-09 08:37:08 +01:00
Anton Khirnov
7d42fd6bb9 lavc: remove disabled FF_API_FIND_BEST_PIX_FMT cruft 2013-03-09 08:36:40 +01:00
Anton Khirnov
845017105f lavc: remove disabled FF_API_DSP_MASK cruft 2013-03-09 08:36:40 +01:00
Anton Khirnov
2a11369523 lavc: remove disabled FF_API_INTER_THRESHOLD cruft 2013-03-09 08:36:40 +01:00
Anton Khirnov
0f24a3ca99 lavc: remove disabled FF_API_OLD_ENCODE_VIDEO cruft 2013-03-09 08:36:40 +01:00
Anton Khirnov
d03a94e2b7 lavc: remove disabled FF_API_SUB_ID cruft 2013-03-09 08:36:40 +01:00
Anton Khirnov
9d6cf81f02 lavc: remove disabled FF_API_COLOR_TABLE_ID cruft 2013-03-09 08:36:40 +01:00
Anton Khirnov
f073b1500e lavc: remove disabled FF_API_OLD_ENCODE_AUDIO cruft 2013-03-09 08:36:40 +01:00
Anton Khirnov
3b0f586f07 lavc: remove disabled FF_API_MPV_GLOBAL_OPTS cruft 2013-03-09 08:36:40 +01:00
Anton Khirnov
5d606863c3 lavc: remove disabled FF_API_OLD_DECODE_AUDIO cruft 2013-03-09 08:36:40 +01:00
Stephen Hutchinson
98c4268eca libutvideo: Prioritize compatibility with new versions 
Signed-off-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
 2013-03-08 20:45:49 -05:00
Justin Ruggles
486f0b0cfc png: use av_mallocz_array() for the zlib zalloc function 
Fixes valgrind uninitialized memory errors when decoding png.

CC:libav-stable@libav.org
 2013-03-08 14:52:21 -05:00
Justin Ruggles
e984f47873 libmp3lame: use the correct remaining buffer size when flushing 
CC:libav-stable@libav.org
 2013-03-08 14:52:05 -05:00
Clément Bœsch
160979f4b4 lavc/utils: make sure the iconv descriptor can be opened only once. 
This prevents trying to do some subtitles conversion for each event when
the character encoding is not found. It now aborts early instead of
flooding stderr.
 2013-03-08 20:51:57 +01:00
Michael Niedermayer
c4e8821732 Merge commit '7ecc2d403ce5c7b6ea3b1f368dccefd105209c7e' 
* commit '7ecc2d403ce5c7b6ea3b1f368dccefd105209c7e':
  Move AVFrame from lavc to lavu.

Conflicts:
	libavcodec/avcodec.h

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2013-03-08 20:33:26 +01:00
Michael Niedermayer
fee484edaf Merge commit 'ad0c9f2d5d81e22207c6ccecc426bf7306acc327' 
* commit 'ad0c9f2d5d81e22207c6ccecc426bf7306acc327':
  lavc: move AVFrame.hwaccel_picture_private to Picture.

Conflicts:
	libavcodec/avcodec.h
	libavcodec/mpegvideo.h

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2013-03-08 19:35:37 +01:00
Michael Niedermayer
d9d97f9b33 Merge commit '1a5e9130162b8adc898e5f6aea82b6372d1e4e6c' 
* commit '1a5e9130162b8adc898e5f6aea82b6372d1e4e6c':
  pthread: avoid copying input packets when possible.

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2013-03-08 19:17:38 +01:00
Michael Niedermayer
2653e12520 Merge commit '1afddbe59e96af75f1c07605afc95615569f388f' 
* commit '1afddbe59e96af75f1c07605afc95615569f388f':
  avpacket: use AVBuffer to allow refcounting the packets.

Conflicts:
	libavcodec/avpacket.c
	libavcodec/utils.c
	libavdevice/v4l2.c
	libavformat/avidec.c
	libavformat/flacdec.c
	libavformat/id3v2.c
	libavformat/matroskaenc.c
	libavformat/mux.c
	libavformat/utils.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2013-03-08 19:12:03 +01:00
Michael Niedermayer
e9fbb9783c Merge commit 'dbd2a34ba5e5e46b6835e4425c360723c643b7a8' 
* commit 'dbd2a34ba5e5e46b6835e4425c360723c643b7a8':
  build: cosmetics: Group hw accelerator Makefile entries together

Conflicts:
	libavcodec/Makefile

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2013-03-08 15:32:39 +01:00
Michael Niedermayer
c32cc7e3a4 Merge commit 'bcd0a7137e4aca0f6f598593b90ca8f338444c51' 
* commit 'bcd0a7137e4aca0f6f598593b90ca8f338444c51':
  configure: Add missing h264chroma dependencies to vp5, vp6
  Add missing error_resilience includes to files that use ER

Conflicts:
	configure
	libavcodec/mpeg12.c
	libavcodec/mpeg4videodec.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2013-03-08 15:23:56 +01:00
Michael Niedermayer
43c6c18690 Merge commit 'd88738e4038b162708dc2f5342e10c1694edfd89' 
* commit 'd88738e4038b162708dc2f5342e10c1694edfd89':
  mpegvideo: Conditionally build error_resilience bits

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2013-03-08 15:17:25 +01:00
Michael Niedermayer
6c17ff84ad Merge commit 'efa7f4202088c70caba11d7834641bc6eaf41830' 
* commit 'efa7f4202088c70caba11d7834641bc6eaf41830':
  Use the avstring.h locale-independent character type functions
  avstring: Add locale independent versions of some ctype.h functions

Conflicts:
	avprobe.c
	doc/APIchanges
	libavcodec/dvdsubdec.c
	libavcodec/utils.c
	libavutil/avstring.c
	libavutil/avstring.h
	libavutil/eval.c
	libavutil/parseutils.c
	libavutil/version.h

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2013-03-08 14:57:41 +01:00
Michael Niedermayer
eab49f4fb5 Revert "aacdec: Reconfigure output as needed, disable pop_output_configuration()" 
This reverts commit 60dbf2eff9.

This is not needed anymore, Ticket 1694 has been fixed differently
 2013-03-08 14:21:40 +01:00
Michael Niedermayer
8978c743fb aacsbr: Check for envelope scalefactors overflowing 
This prevents various values from becoming stuck at NAN and
output to become silent
If someone knows a cleaner solution, thats welcome!

Fixes Ticket2335

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-03-08 14:21:40 +01:00
Anton Khirnov
7c45087b84 lavc: update the fallback versions of ff_thread_* 
Fixes build without threads after
759001c534.
 2013-03-08 10:22:10 +01:00