Michael Niedermayer
f016a23c7f
Merge commit 'c7a5acabc537c2ce363165c31250aba341b1a990'
...
* commit 'c7a5acabc537c2ce363165c31250aba341b1a990':
dnxhddec: stop using deprecated avcodec_set_dimensions
dirac: stop using deprecated avcodec_set_dimensions
cdxl: stop using deprecated avcodec_set_dimensions
avs: stop using deprecated avcodec_set_dimensions
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-11-01 13:40:04 +01:00
Michael Niedermayer
5ef0c00580
Merge commit '78780c8bf6246a1cf1cd0c9096b49dc082a6a8e5'
...
* commit '78780c8bf6246a1cf1cd0c9096b49dc082a6a8e5':
ansi: stop using deprecated avcodec_set_dimensions
Conflicts:
libavcodec/ansi.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-11-01 13:28:33 +01:00
Michael Niedermayer
66f436adf5
Merge commit '0f6c1d6d64c9f6255ea579dace27d0dd695f0213'
...
* commit '0f6c1d6d64c9f6255ea579dace27d0dd695f0213':
lavc/utils: stop using deprecated avcodec_set_dimensions
Conflicts:
libavcodec/utils.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-11-01 13:21:14 +01:00
Michael Niedermayer
7b91e9cf5d
Merge commit '7644f5a80787c9b608b82873604805d7e38a6a18'
...
* commit '7644f5a80787c9b608b82873604805d7e38a6a18':
lavc: replace avcodec_set_dimensions with ff_set_dimensions
Conflicts:
libavcodec/utils.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-11-01 13:07:15 +01:00
Michael Niedermayer
f62dfed3de
h264: simplify frame_recovered code
...
This is a separate commit to ease future bisecting in case it breaks something.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-11-01 12:59:40 +01:00
Michael Niedermayer
78265fcfee
Merge commit '28096e0a806e57376541e6222d315619906e3c55'
...
* commit '28096e0a806e57376541e6222d315619906e3c55':
h264: wait for initial complete frame before outputing frames
Conflicts:
doc/APIchanges
libavcodec/h264.c
libavcodec/mpegvideo.h
libavutil/frame.h
libavutil/version.h
See: a64b028aeb6579636e578ceb73f69b468bddb2f0 (as well as various later commits)
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-11-01 12:59:08 +01:00
Michael Niedermayer
a2bfee36b7
Merge commit '9af7a8523a6bb517834ebed36093bdab11a8b38e'
...
* commit '9af7a8523a6bb517834ebed36093bdab11a8b38e':
HNM4/HNM4A demuxer & video decoder
Conflicts:
Changelog
doc/general.texi
libavcodec/Makefile
libavcodec/allcodecs.c
libavcodec/avcodec.h
libavcodec/version.h
libavformat/Makefile
libavformat/allformats.c
libavformat/version.h
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-11-01 10:46:39 +01:00
Michael Niedermayer
ec5e02d495
avcodec/wmv2enc: Collect statistics for 2 pass encoding
...
Fixes Ticket3053
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-11-01 00:40:33 +01:00
Compn
6173b0fea7
aacdec: fix small comment, update decoder features comment
2013-10-31 15:57:16 -04:00
Carl Eugen Hoyos
5ab1efb9d0
Fix a crash on oom when decoding hevc.
2013-10-31 20:17:18 +01:00
Anton Khirnov
c7a5acabc5
dnxhddec: stop using deprecated avcodec_set_dimensions
2013-10-31 20:14:15 +01:00
Anton Khirnov
e9cfbc2b53
dirac: stop using deprecated avcodec_set_dimensions
2013-10-31 20:14:15 +01:00
Anton Khirnov
78780c8bf6
ansi: stop using deprecated avcodec_set_dimensions
2013-10-31 20:14:14 +01:00
Anton Khirnov
0f6c1d6d64
lavc/utils: stop using deprecated avcodec_set_dimensions
2013-10-31 20:14:14 +01:00
Anton Khirnov
7644f5a807
lavc: replace avcodec_set_dimensions with ff_set_dimensions
...
avcodec_set_dimensions() is supposed to be an internal utility function,
there is no reason whatsoever for it to be public. Therefore deprecate
it.
2013-10-31 20:14:14 +01:00
John Stebbins
28096e0a80
h264: wait for initial complete frame before outputing frames
...
This can be optionally disabled whith the "output_corrupt" flags
option. When in "output_corrupt" mode, incomplete frames are
signalled through AVFrame.flags FRAME_FLAG_INCOMPLETE_FRAME.
Signed-off-by: Anton Khirnov <anton@khirnov.net>
2013-10-31 20:14:14 +01:00
Anton Khirnov
d57e95cbd4
cdxl: stop using deprecated avcodec_set_dimensions
2013-10-31 20:14:14 +01:00
Anton Khirnov
f176e11cff
avs: stop using deprecated avcodec_set_dimensions
2013-10-31 20:14:14 +01:00
David Kment
9af7a8523a
HNM4/HNM4A demuxer & video decoder
...
Signed-off-by: Diego Biurrun <diego@biurrun.de>
2013-10-31 17:45:46 +01:00
Michael Niedermayer
fa6fa2162b
avcodec/cabac: support UNCHECKED_BITSTREAM_READER = 0
...
Fixes overreads in HEVC
Fixes Ticket3070
Also fixed remaining issues from Ticket3075 and Ticket3076
Some lines of code taken from 0c5f839693da2276c2da23400f67a67be4ea0af1:libavcodec/x86/cabac.h
and 0c5f839693da2276c2da23400f67a67be4ea0af1:libavcodec/cabac_functions.h
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-10-31 11:13:27 +01:00
Mickaël Raulet
7c8b65f688
hevc: add partial support for interlaced(cherry picked from commit 44b592ae6d323445c076ef3ec966ebf9daa8bccf)
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-10-31 10:00:22 +01:00
Michael Niedermayer
cb52d6da0a
avcodec/bink: fix seeking to frame 0
...
Fixes Ticket3088
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-10-30 23:56:52 +01:00
Michael Niedermayer
cc0e47b550
avcodec/jpeglsdec: check err value for ls_get_code_runterm()
...
Fixes infinite loop
Fixes Ticket3086
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-10-30 23:32:51 +01:00
Michael Niedermayer
18802942d1
avcodec/mpeg12dec: Use skip_1stop_8data_bits()
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-10-30 21:29:21 +01:00
Michael Niedermayer
f031531816
avcodec/vaapi_mpeg2: Use skip_1stop_8data_bits()
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-10-30 18:28:00 +01:00
Michael Niedermayer
9c7662aeba
avcodec/svq3: Use skip_1stop_8data_bits()
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-10-30 18:28:00 +01:00
Michael Niedermayer
c882b62d14
avcodec/svq1dec: Use skip_1stop_8data_bits()
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-10-30 18:28:00 +01:00
Michael Niedermayer
f4d3127197
avcodec/ituh263dec: Use skip_1stop_8data_bits()
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-10-30 18:28:00 +01:00
Michael Niedermayer
ddc6ed9187
avcodec/intelh263dec: Use skip_1stop_8data_bits()
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-10-30 18:28:00 +01:00
Michael Niedermayer
711e981276
avcodec/h261dec: Use skip_1stop_8data_bits()
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-10-30 18:28:00 +01:00
Michael Niedermayer
9c284a8e19
avcodec/flvdec: Use skip_1stop_8data_bits()
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-10-30 18:28:00 +01:00
Michael Niedermayer
34087b0564
avcodec/dxva2_mpeg2: Use skip_1stop_8data_bits()
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-10-30 18:28:00 +01:00
Michael Niedermayer
44e8e82d34
avcodec/get_bits: add skip_1stop_8data_bits
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-10-30 18:22:03 +01:00
Michael Niedermayer
94a80e36d3
avcodec/intelh263dec: make while get_bits loop more robust by checking bits left
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-10-30 15:01:00 +01:00
Michael Niedermayer
810f9c5eaa
avcodec/ituh263dec: make while get_bits loop more robust by checking bits left
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-10-30 15:00:38 +01:00
Michael Niedermayer
489c575bd6
avcodec/ivi_common: make while get_bits loop more robust by checking bits left
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-10-30 14:59:00 +01:00
Michael Niedermayer
4b12930f79
avcodec/flacdec: use get_unary() simplify code
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-10-30 14:58:04 +01:00
Michael Niedermayer
719dbe86ea
avcodec/h261dec: make while get_bits loop more robust by checking bits left
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-10-30 14:45:39 +01:00
Michael Niedermayer
b0f8b5c819
avcodec/flvdec: make while get_bits loop more robust by checking bits left
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-10-30 14:39:31 +01:00
Michael Niedermayer
9f5b75f241
avcodec/flacdec: make while get_bits loop more robust by checking bits left
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-10-30 14:39:31 +01:00
Paul B Mahol
65988b9916
avcodec/cook: fix deadlock by using get_unary()
...
Fixes #3089 .
Reported-by: Piotr Bandurski <ami_stuff@o2.pl>
Signed-off-by: Paul B Mahol <onemda@gmail.com>
2013-10-30 13:26:55 +00:00
Paul B Mahol
387e76f993
avcodec/mdec: use dsp.bswap16_buf()
...
Signed-off-by: Paul B Mahol <onemda@gmail.com>
2013-10-30 12:41:43 +00:00
Paul B Mahol
268d0d6e6c
avcodec/svq3: use av_fast_padded_malloc()
...
Signed-off-by: Paul B Mahol <onemda@gmail.com>
2013-10-30 11:04:07 +00:00
Paul B Mahol
8e609eb475
avcodec/utvideoenc: use av_fast_padded_malloc()
...
Signed-off-by: Paul B Mahol <onemda@gmail.com>
2013-10-30 11:04:07 +00:00
Paul B Mahol
82e576046c
avcodec/wavpack: use init_get_bits8()
...
Signed-off-by: Paul B Mahol <onemda@gmail.com>
2013-10-30 11:04:07 +00:00
Paul B Mahol
49c6f0ae15
avcodec/apedec: use init_get_bits8()
...
Signed-off-by: Paul B Mahol <onemda@gmail.com>
2013-10-30 11:04:06 +00:00
Paul B Mahol
2508fa10c6
avcodec/xan: use init_get_bits8()
...
Signed-off-by: Paul B Mahol <onemda@gmail.com>
2013-10-30 11:04:06 +00:00
Paul B Mahol
1de8dfcbc4
avcodec/binkaudio: use init_get_bits8()
...
Signed-off-by: Paul B Mahol <onemda@gmail.com>
2013-10-30 11:04:06 +00:00
Paul B Mahol
2820562935
avcodec/4xm: use av_fast_padded_malloc()
...
Signed-off-by: Paul B Mahol <onemda@gmail.com>
2013-10-30 11:04:06 +00:00
Paul B Mahol
c783bec6dc
avcodec/mdec: use av_fast_padded_malloc()
...
Signed-off-by: Paul B Mahol <onemda@gmail.com>
2013-10-30 11:04:05 +00:00