Michael Niedermayer
045214e3d9
Merge remote-tracking branch 'cehoyos/master'
...
* cehoyos/master:
libavfilter/decimate: Add pts of first frame to all frames.
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-10-31 14:27:51 +01:00
Michael Niedermayer
532ca12300
Merge remote-tracking branch 'qatar/master'
...
* qatar/master:
build: Ensure that strip commands are run silently
Conflicts:
Makefile
Not merged as it conflicts with strip being on the BRIEF list
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-10-31 13:35:55 +01:00
Diego Biurrun
ee80cf741a
avfilter: x86: K&R formatting cosmetics
2013-10-31 12:15:54 +01:00
Diego Biurrun
c7f25d4c7f
build: Ensure that strip commands are run silently
2013-10-31 11:48:59 +01:00
Carl Eugen Hoyos
e4b0a77021
libavfilter/decimate: Add pts of first frame to all frames.
...
Fixes ticket #3019
Reviewed-by: Clément Bœsch
2013-10-31 11:24:43 +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
6c4b87d3d6
avformat/thp: force moving forward
...
Fixes infinite loop
Fixes Ticket3098
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-10-31 02:26:07 +01:00
Michael Niedermayer
2b1056e4e2
avformat/thp: fix variable types to avoid overflows
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-10-31 02:19:40 +01:00
Michael Niedermayer
b73900b8a6
avformat/http: fix cookies
...
Fixes Ticket3096
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-10-31 01:42:13 +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
Reimar Döffinger
4fab08c94f
Optimize pure C unscaled yuv2rgb.
...
Aligning the tables reduces the amount of code generated on
e.g. ARM as the offset constant then has few enough set bits
so it can be encoded inside a single instruction instead of 2.
Ideally all should be declared aligned, but the DECLARE_ALIGNED
macros does not work with pointer tables, thus also reordered
the tables.
Signed-off-by: Reimar Döffinger <Reimar.Doeffinger@gmx.de>
2013-10-30 20:52:24 +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
7f019129e1
Merge remote-tracking branch 'qatar/master'
...
* qatar/master:
lavf: Remove a now useless parameter to ffurl_register_protocol
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-10-30 17:48:47 +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
Clément Bœsch
0c6bb53bb2
doc/examples/demuxing: reset got_frame.
...
Fix infinite loop at flushing.
2013-10-30 14:37:58 +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
Paul B Mahol
62ef736f5a
avcodec/motionpixels: use av_fast_padded_malloc()
...
Signed-off-by: Paul B Mahol <onemda@gmail.com>
2013-10-30 11:04:05 +00:00
Michael Niedermayer
7fd7a10efd
Merge remote-tracking branch 'qatar/master'
...
* qatar/master:
oggparsetheora: check av_mallocz result
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-10-30 10:41:06 +01:00
Michael Niedermayer
0b9e480b8f
Merge commit '5e5fb21877d8da7b3b8a27bb4d6a070d210c152d'
...
* commit '5e5fb21877d8da7b3b8a27bb4d6a070d210c152d':
oggparsetheora: return meaningful error codes
Conflicts:
libavformat/oggparsetheora.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-10-30 10:35:29 +01:00
Michael Niedermayer
70737b83f0
Merge commit 'd4c12b8be4bdd2ffddb3bd5e11773de4c4c46f68'
...
* commit 'd4c12b8be4bdd2ffddb3bd5e11773de4c4c46f68':
oggparsetheora: K&R cosmetics, reformat
Conflicts:
libavformat/oggparsetheora.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-10-30 10:26:00 +01:00
Michael Niedermayer
558784f113
Merge commit 'b9589f5a770ec2357ab7920a5fabe8510b8601f9'
...
* commit 'b9589f5a770ec2357ab7920a5fabe8510b8601f9':
lavc: add error checking to apply_param_change.
Conflicts:
libavcodec/utils.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-10-30 10:23:24 +01:00
Michael Niedermayer
4427fe7e4b
Merge commit '5c0a09839c707f10e5dba59460e219e989c1da93'
...
* commit '5c0a09839c707f10e5dba59460e219e989c1da93':
libopenjpegdec: return meaningful error codes
Conflicts:
libavcodec/libopenjpegdec.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-10-30 09:33:46 +01:00
Martin Storsjö
0c5f839693
lavf: Remove a now useless parameter to ffurl_register_protocol
...
This was added in 9b07a2dc02
as an ABI hack to allow older
code built with lavf 52 to register protocols even if the size
of the URLProtocol struct was increased. Later, registering
protocols from outside of lavf was removed and this workaround
isn't needed any longer since lavf 53.
This removes an unchecked malloc and a memory leak for the cases
when this workaround actually was used - which it hasn't since
lavf 53.
Signed-off-by: Martin Storsjö <martin@martin.st>
2013-10-30 09:53:48 +02:00
Anton Khirnov
4f2d8968c0
oggparsetheora: check av_mallocz result
2013-10-30 08:45:31 +01:00