Michael Niedermayer
525289ed26
Merge commit '57070b1468edc6ac8cb3696c817f3c943975d4c1'
...
* commit '57070b1468edc6ac8cb3696c817f3c943975d4c1':
flashsv: Check diff_start diff_height values
Conflicts:
libavcodec/flashsv.c
See: 880c73cd76
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-11-02 09:39:51 +01:00
Michael Niedermayer
77c33424c1
Merge commit '4a64e67988dd01005efb1ae831bff14c1656b573'
...
* commit '4a64e67988dd01005efb1ae831bff14c1656b573':
flashsv: Refactor a little
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-11-02 09:33:34 +01:00
Michael Niedermayer
8183e33225
h264_refs: use named constant for setting frame_recovered
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-11-02 09:31:12 +01:00
Michael Niedermayer
647adc4290
h264: factor "if(h->sei_recovery_frame_cnt >= 0)" out
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-11-02 01:02:21 +01:00
Michael Niedermayer
f578e5d937
avcodec/hevc: Adjust white-spaces to reduce difference to 064698d381
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-11-02 00:44:54 +01:00
Mickaël Raulet
38612379bf
hevc: fix temporal_id(cherry picked from commit 5eac0df49d33bef7f3ffc5efde19839dddb554e8)
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-11-02 00:44:54 +01:00
Vittorio Giovara
dc6ea00cd2
mpeg4video: K&R formatting cosmetics
...
Signed-off-by: Diego Biurrun <diego@biurrun.de>
2013-11-01 22:53:48 +01:00
Luca Barbato
037fea388e
flashsv: K&R formatting cosmetics
...
Also improve some log message wording/spelling.
Signed-off-by: Diego Biurrun <diego@biurrun.de>
2013-11-01 22:32:53 +01:00
Diego Biurrun
1700b4e678
x86: vp8dsp: Split loopfilter code into a separate file
2013-11-01 22:05:20 +01:00
Paul B Mahol
0610d6e8ae
avcodec/mvcdec: stop using deprecated avcodec_set_dimensions()
...
Signed-off-by: Paul B Mahol <onemda@gmail.com>
2013-11-01 19:05:35 +00:00
Paul B Mahol
256b986c04
avcodec/exr: stop using deprecated avcodec_set_dimensions()
...
Signed-off-by: Paul B Mahol <onemda@gmail.com>
2013-11-01 19:05:35 +00:00
Paul B Mahol
01507ab369
avcodec/sanm: stop using deprecated avcodec_set_dimensions()
...
Signed-off-by: Paul B Mahol <onemda@gmail.com>
2013-11-01 19:05:35 +00:00
Michael Niedermayer
73d887733d
avcodec/tiff_common: allow count = 0 in ff_tadd_bytes_metadata()
...
Fixes Ticket3103
Reviewed-by: Thilo Borgmann <thilo.borgmann@mail.de>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-11-01 19:49:05 +01:00
Michael Niedermayer
57070b1468
flashsv: Check diff_start diff_height values
...
Fix out of array accesses.
Found-by: ami_stuff
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-11-01 19:38:53 +01:00
Luca Barbato
4a64e67988
flashsv: Refactor a little
2013-11-01 19:38:53 +01:00
Michael Niedermayer
382545ae62
Merge commit '28240a60c1b5ce276e947ba013271ec009adc078'
...
* commit '28240a60c1b5ce276e947ba013271ec009adc078':
lavc: move FF_ASPECT_EXTENDED from avcodec.h to h263.h
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-11-01 19:20:02 +01:00
Michael Niedermayer
935d0ee08d
Merge commit 'eb5920c195d1b0bda81782af4ba0c5982f5225b3'
...
* commit 'eb5920c195d1b0bda81782af4ba0c5982f5225b3':
lavc: deprecate unused FF_BUG_OLD_MSMPEG4
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-11-01 19:12:13 +01:00
Michael Niedermayer
7592d30bcb
Merge commit '0300962b76644f145b773439989a5cdf1667e162'
...
* commit '0300962b76644f145b773439989a5cdf1667e162':
lavc: schedule FF_BUG_AC_VLC for removal on the next major bump.
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-11-01 19:03:19 +01:00
Michael Niedermayer
9bcf647867
avcodec: document that FF_DEBUG_VIS_QP / FF_DEBUG_VIS_MB_TYPE should only be used through avoptions
...
This preempts ABI issues if their values get reused by the fork for something unrelated
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-11-01 18:53:01 +01:00
Michael Niedermayer
2a2cc0af6d
Merge commit 'f8b2bcd2adab65658ffd45f9f13b032af6600bf8'
...
* commit 'f8b2bcd2adab65658ffd45f9f13b032af6600bf8':
lavc: deprecate FF_DEBUG_VIS_*
leave the AVOptions as they work fine
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-11-01 18:51:34 +01:00
Michael Niedermayer
f49e6359b6
avcodec/avcodec.h: move debug_mv to the end of the struct with the next ABI bump
...
This maintains ABI compatibility
also add a note that debug_mv must be accessed through AVOptions (for ABI)
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-11-01 18:38:51 +01:00
Michael Niedermayer
66df6f5407
Merge commit 'a1504eee41b39f62dbfe0a0ca6b96c2716bf7577'
...
* commit 'a1504eee41b39f62dbfe0a0ca6b96c2716bf7577':
lavc: deprecate AVCodecContext.debug_mv
Conflicts:
libavcodec/options_table.h
Not merged, debug_mv works fine
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-11-01 18:36:46 +01:00
Michael Niedermayer
c6c03dfdf1
Merge commit 'ccc71298456d97f64f539e303c771d04dcb33c53'
...
* commit 'ccc71298456d97f64f539e303c771d04dcb33c53':
lavc: deprecate FF_DEBUG_MV and remove all traces of its use
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-11-01 18:22:42 +01:00
Michael Niedermayer
5eb1704d5f
Merge commit '064698d381e1e7790f21b0199a8930ea04e2e942'
...
* commit '064698d381e1e7790f21b0199a8930ea04e2e942':
Add HEVC decoder
Conflicts:
Changelog
libavcodec/Makefile
libavcodec/allcodecs.c
libavcodec/hevc.c
libavcodec/hevc.h
libavcodec/hevc_cabac.c
libavcodec/hevc_filter.c
libavcodec/hevc_mvs.c
libavcodec/hevc_parser.c
libavcodec/hevc_ps.c
libavcodec/hevc_refs.c
libavcodec/hevc_sei.c
libavcodec/hevcdsp.c
libavcodec/hevcdsp_template.c
libavcodec/hevcpred.c
libavcodec/hevcpred_template.c
libavcodec/version.h
cosmetics from hevc.h & hevc_ps.c mostly merged, other files left as they where in ffmpeg.
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-11-01 17:13:00 +01:00
Michael Niedermayer
8b2dd04afc
Merge commit '0a9e94bba8f8a40156438a43e4fe0e9ae36236cb'
...
* commit '0a9e94bba8f8a40156438a43e4fe0e9ae36236cb':
webp: stop using deprecated avcodec_set_dimensions
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-11-01 15:55:58 +01:00
Michael Niedermayer
98ca3fb9cf
Merge commit '757d5e8ef98ba2ab0dd0e85a46290c4f4a7e82be'
...
* commit '757d5e8ef98ba2ab0dd0e85a46290c4f4a7e82be':
vp8: stop using deprecated avcodec_set_dimensions
vp56: stop using deprecated avcodec_set_dimensions
vp3: stop using deprecated avcodec_set_dimensions
txd: stop using deprecated avcodec_set_dimensions
truemotion1: stop using deprecated avcodec_set_dimensions
Conflicts:
libavcodec/txd.c
libavcodec/vp56.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-11-01 15:49:58 +01:00
Michael Niedermayer
ffd100b111
Merge commit 'c265b8bb7638546919465e3585441b1d40c4b13d'
...
* commit 'c265b8bb7638546919465e3585441b1d40c4b13d':
tiff: stop using deprecated avcodec_set_dimensions
targa: stop using deprecated avcodec_set_dimensions
svq1dec: stop using deprecated avcodec_set_dimensions
sunrast: stop using deprecated avcodec_set_dimensions
Conflicts:
libavcodec/sunrast.c
libavcodec/targa.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-11-01 15:43:29 +01:00
Michael Niedermayer
7630e564ca
Merge commit 'c755870d52c8c29676e5ba7ee9557adf4a7ca934'
...
* commit 'c755870d52c8c29676e5ba7ee9557adf4a7ca934':
sgidec: stop using deprecated avcodec_set_dimensions
rv34: stop using deprecated avcodec_set_dimensions
rv10: stop using deprecated avcodec_set_dimensions
ptx: stop using deprecated avcodec_set_dimensions
Conflicts:
libavcodec/ptx.c
libavcodec/rv10.c
libavcodec/sgidec.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-11-01 15:34:49 +01:00
Michael Niedermayer
a897ba33e8
Merge commit '0f21d8b1b40848973558c737aebe800c46e93a3d'
...
* commit '0f21d8b1b40848973558c737aebe800c46e93a3d':
pictordec: stop using deprecated avcodec_set_dimensions
pgssubdec: stop using deprecated avcodec_set_dimensions
pcx: stop using deprecated avcodec_set_dimensions
mpegvideo_parser: stop using deprecated avcodec_set_dimensions
Conflicts:
libavcodec/pcx.c
libavcodec/pgssubdec.c
libavcodec/pictordec.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-11-01 15:25:09 +01:00
Michael Niedermayer
64a0ed190e
Merge commit '13207484bba8a8b78b40d5a22da8c9c555429089'
...
* commit '13207484bba8a8b78b40d5a22da8c9c555429089':
mpeg4video_parser: stop using deprecated avcodec_set_dimensions
mpeg12dec: stop using deprecated avcodec_set_dimensions
mjpegdec: stop using deprecated avcodec_set_dimensions
libvpxdec: stop using deprecated avcodec_set_dimensions
Conflicts:
libavcodec/mjpegdec.c
libavcodec/mpeg12dec.c
libavcodec/mpeg4video_parser.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-11-01 15:14:52 +01:00
Michael Niedermayer
bf92cd8178
Merge commit '967cd6fafbf2fdec9cbe011296ad34a70212427e'
...
* commit '967cd6fafbf2fdec9cbe011296ad34a70212427e':
libopenjpegdec: stop using deprecated avcodec_set_dimensions
kgv1dec: stop using deprecated avcodec_set_dimensions
ivi_common: stop using deprecated avcodec_set_dimensions
indeo3: stop using deprecated avcodec_set_dimensions
Conflicts:
libavcodec/ivi_common.c
libavcodec/kgv1dec.c
libavcodec/libopenjpegdec.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-11-01 15:07:25 +01:00
Michael Niedermayer
e6b9d71ad9
Merge commit '3b086317277e3f3b61c0343930d8e2570b278bd6'
...
* commit '3b086317277e3f3b61c0343930d8e2570b278bd6':
h26[13]dec: stop using deprecated avcodec_set_dimensions
gifdec: stop using deprecated avcodec_set_dimensions
g2meet: stop using deprecated avcodec_set_dimensions
Conflicts:
libavcodec/gifdec.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-11-01 14:54:40 +01:00
Michael Niedermayer
bf688d23b5
Merge commit 'ec7063005ee67c0b4d4b83aa5118dd22ad1094e8'
...
* commit 'ec7063005ee67c0b4d4b83aa5118dd22ad1094e8':
eatqi: stop using deprecated avcodec_set_dimensions
eatgv: stop using deprecated avcodec_set_dimensions
eatgq: stop using deprecated avcodec_set_dimensions
eamad: stop using deprecated avcodec_set_dimensions
Conflicts:
libavcodec/eamad.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-11-01 14:09:17 +01:00
Michael Niedermayer
4a35651267
Merge commit 'd6da372984c87fd6288c148c291065d6032ceda3'
...
* commit 'd6da372984c87fd6288c148c291065d6032ceda3':
eacmv: stop using deprecated avcodec_set_dimensions
dvdsubdec: stop using deprecated avcodec_set_dimensions
dvdec: stop using deprecated avcodec_set_dimensions
dpx: stop using deprecated avcodec_set_dimensions
Conflicts:
libavcodec/dpx.c
libavcodec/dvdec.c
libavcodec/dvdsubdec.c
libavcodec/eacmv.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-11-01 14:01:02 +01:00
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: a64b028aeb
(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
Anton Khirnov
28240a60c1
lavc: move FF_ASPECT_EXTENDED from avcodec.h to h263.h
...
It's for internal use only.
2013-10-31 20:24:48 +01:00
Anton Khirnov
eb5920c195
lavc: deprecate unused FF_BUG_OLD_MSMPEG4
2013-10-31 20:24:30 +01:00
Anton Khirnov
0300962b76
lavc: schedule FF_BUG_AC_VLC for removal on the next major bump.
...
It has been deprecated/unused for about 10 years.
2013-10-31 20:23:42 +01:00
Anton Khirnov
f8b2bcd2ad
lavc: deprecate FF_DEBUG_VIS_*
...
Those flags have no effect since
37045e4229
.
2013-10-31 20:23:08 +01:00
Anton Khirnov
a1504eee41
lavc: deprecate AVCodecContext.debug_mv
...
It has been unused since 37045e4229
.
2013-10-31 20:22:51 +01:00
Anton Khirnov
ccc7129845
lavc: deprecate FF_DEBUG_MV and remove all traces of its use
...
It has not been actually used since
37045e4229
, when the broken vismv code was
removed.
2013-10-31 20:21:13 +01:00
Guillaume Martres
064698d381
Add HEVC decoder
...
Initially written by Guillaume Martres <smarter@ubuntu.com> as a GSoC
project. Further contributions by the OpenHEVC project and other
developers, namely:
Mickaël Raulet <mraulet@insa-rennes.fr>
Seppo Tomperi <seppo.tomperi@vtt.fi>
Gildas Cocherel <gildas.cocherel@laposte.net>
Khaled Jerbi <khaled_jerbi@yahoo.fr>
Wassim Hamidouche <wassim.hamidouche@insa-rennes.fr>
Vittorio Giovara <vittorio.giovara@gmail.com>
Jan Ekström <jeebjp@gmail.com>
Anton Khirnov <anton@khirnov.net>
Martin Storsjö <martin@martin.st>
Luca Barbato <lu_zero@gentoo.org>
Yusuke Nakamura <muken.the.vfrmaniac@gmail.com>
Reimar Döffinger <Reimar.Doeffinger@gmx.de>
Diego Biurrun <diego@biurrun.de>
Signed-off-by: Anton Khirnov <anton@khirnov.net>
2013-10-31 20:19:59 +01:00
Carl Eugen Hoyos
5ab1efb9d0
Fix a crash on oom when decoding hevc.
2013-10-31 20:17:18 +01:00
Anton Khirnov
0a9e94bba8
webp: stop using deprecated avcodec_set_dimensions
2013-10-31 20:14:16 +01:00
Anton Khirnov
757d5e8ef9
vp8: stop using deprecated avcodec_set_dimensions
2013-10-31 20:14:16 +01:00
Anton Khirnov
c265b8bb76
tiff: stop using deprecated avcodec_set_dimensions
2013-10-31 20:14:16 +01:00
Anton Khirnov
c755870d52
sgidec: stop using deprecated avcodec_set_dimensions
2013-10-31 20:14:16 +01:00
Anton Khirnov
0f21d8b1b4
pictordec: stop using deprecated avcodec_set_dimensions
2013-10-31 20:14:16 +01:00
Anton Khirnov
2e0ab4d314
vp56: stop using deprecated avcodec_set_dimensions
2013-10-31 20:14:16 +01:00
Anton Khirnov
eed5a478ba
targa: stop using deprecated avcodec_set_dimensions
2013-10-31 20:14:16 +01:00
Anton Khirnov
1d389e2a80
rv34: stop using deprecated avcodec_set_dimensions
2013-10-31 20:14:16 +01:00
Anton Khirnov
41ad353dcf
pgssubdec: stop using deprecated avcodec_set_dimensions
2013-10-31 20:14:16 +01:00
Anton Khirnov
b53febc1c0
vp3: stop using deprecated avcodec_set_dimensions
2013-10-31 20:14:16 +01:00
Anton Khirnov
7fbb75cc70
svq1dec: stop using deprecated avcodec_set_dimensions
2013-10-31 20:14:16 +01:00
Anton Khirnov
ce9f5b13ed
rv10: stop using deprecated avcodec_set_dimensions
2013-10-31 20:14:16 +01:00
Anton Khirnov
0679416269
pcx: stop using deprecated avcodec_set_dimensions
2013-10-31 20:14:16 +01:00
Anton Khirnov
3cfdb912cb
txd: stop using deprecated avcodec_set_dimensions
2013-10-31 20:14:16 +01:00
Anton Khirnov
9c0ece1b4f
sunrast: stop using deprecated avcodec_set_dimensions
2013-10-31 20:14:16 +01:00
Anton Khirnov
e7ea97039d
ptx: stop using deprecated avcodec_set_dimensions
2013-10-31 20:14:16 +01:00
Anton Khirnov
6da9c9d381
mpegvideo_parser: stop using deprecated avcodec_set_dimensions
2013-10-31 20:14:16 +01:00
Anton Khirnov
db92e4ea8d
truemotion1: stop using deprecated avcodec_set_dimensions
2013-10-31 20:14:16 +01:00
Anton Khirnov
13207484bb
mpeg4video_parser: stop using deprecated avcodec_set_dimensions
2013-10-31 20:14:15 +01:00
Anton Khirnov
967cd6fafb
libopenjpegdec: stop using deprecated avcodec_set_dimensions
2013-10-31 20:14:15 +01:00
Anton Khirnov
3b08631727
h26[13]dec: stop using deprecated avcodec_set_dimensions
2013-10-31 20:14:15 +01:00
Anton Khirnov
ec7063005e
eatqi: stop using deprecated avcodec_set_dimensions
2013-10-31 20:14:15 +01:00
Anton Khirnov
d6da372984
eacmv: stop using deprecated avcodec_set_dimensions
2013-10-31 20:14:15 +01:00
Anton Khirnov
c7a5acabc5
dnxhddec: stop using deprecated avcodec_set_dimensions
2013-10-31 20:14:15 +01:00
Anton Khirnov
6c7254722a
mpeg12dec: stop using deprecated avcodec_set_dimensions
2013-10-31 20:14:15 +01:00
Anton Khirnov
d62b24a3f6
kgv1dec: stop using deprecated avcodec_set_dimensions
2013-10-31 20:14:15 +01:00
Anton Khirnov
8255535c5f
gifdec: stop using deprecated avcodec_set_dimensions
2013-10-31 20:14:15 +01:00
Anton Khirnov
a87739388d
eatgv: stop using deprecated avcodec_set_dimensions
2013-10-31 20:14:15 +01:00
Anton Khirnov
babbec0867
dvdsubdec: 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
2cd94ad5bf
mjpegdec: stop using deprecated avcodec_set_dimensions
2013-10-31 20:14:15 +01:00
Anton Khirnov
d184cd1dac
ivi_common: stop using deprecated avcodec_set_dimensions
2013-10-31 20:14:15 +01:00
Anton Khirnov
58c6239e85
g2meet: stop using deprecated avcodec_set_dimensions
2013-10-31 20:14:15 +01:00
Anton Khirnov
06e7a20244
eatgq: stop using deprecated avcodec_set_dimensions
2013-10-31 20:14:15 +01:00
Anton Khirnov
caeed8deeb
dvdec: stop using deprecated avcodec_set_dimensions
2013-10-31 20:14:15 +01:00
Anton Khirnov
b870582485
libvpxdec: stop using deprecated avcodec_set_dimensions
2013-10-31 20:14:15 +01:00
Anton Khirnov
317d6a1503
indeo3: stop using deprecated avcodec_set_dimensions
2013-10-31 20:14:15 +01:00
Anton Khirnov
c6b8a7dbb4
eamad: stop using deprecated avcodec_set_dimensions
2013-10-31 20:14:15 +01:00
Anton Khirnov
8451b5f00a
dpx: 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
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
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
Anton Khirnov
b9589f5a77
lavc: add error checking to apply_param_change.
2013-10-30 08:43:03 +01:00
Anton Khirnov
5c0a09839c
libopenjpegdec: return meaningful error codes
2013-10-30 08:42:41 +01:00
Michael Niedermayer
e1848aa469
avcodec/mpeg12dec: forward errors when EXPLODE is set
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-10-30 02:08:34 +01:00
Stefano Sabatini
d4ac3e5934
lavc/mpegvideo_enc: fix typo
2013-10-29 18:36:21 +01:00
Stefano Sabatini
9fa0dccca6
lavc: extend documentation for the "bf" option
2013-10-29 18:30:27 +01:00
Michael Niedermayer
ce55e667fa
avcodec/mpegvideo_enc: check that max_b_frames is not negative
...
Fixes crash found by saste
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-10-29 16:13:07 +01:00
Derek Buitenhuis
58d13cea30
h264: Check all allocations
...
Signed-off-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
2013-10-29 14:00:29 +00:00
Derek Buitenhuis
a483aae7d8
h264: Check all allocations
...
Signed-off-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
2013-10-29 12:00:27 +00:00
Michael Niedermayer
e36231969a
avcodec/audioconvert: deprecate API
...
Note, the header was not installed so useage of this should be limited
but its not 0, there are some random pieces of code using it according
to google.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-10-29 10:48:57 +01:00
Paul B Mahol
66518f6feb
avcodec/cook: use av_freep()
...
Signed-off-by: Paul B Mahol <onemda@gmail.com>
2013-10-29 09:37:59 +00:00
Michael Niedermayer
e510171f31
avcodec: fix old codec ids
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-10-28 23:54:28 +01:00
Michael Niedermayer
f0b26bf0f5
avcodec/dvdec: dont try to decode ac when theres no input
...
fixes reading out of an empty bitstream
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-10-28 23:09:35 +01:00
Michael Niedermayer
c00686518c
avcodec/h263dec: fix handling of AV_EF_EXPLODE
...
This fixes checking a variable that had been overwritten before.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-10-28 17:05:59 +01:00
Anton Khirnov
c9a13a289d
lavc: remove old unused audio conversion functions.
2013-10-28 15:29:37 +01:00
Michael Niedermayer
17e47ec8be
Merge commit 'a1c5cc429d99216406170eac7e8352860076d3e8'
...
* commit 'a1c5cc429d99216406170eac7e8352860076d3e8':
lavc: don't set AVFrame.pts to random numbers in decoders.
Conflicts:
libavcodec/mpeg4videodec.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-10-28 14:12:37 +01:00
Michael Niedermayer
6c82c87dbb
ac3dec: fix outptr increment.
...
Fixes corrupt data errors when downmixing in the AC-3 decoder.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Signed-off-by: Justin Ruggles <justin.ruggles@gmail.com>
CC:libav-stable@libav.org
2013-10-28 08:33:21 -04:00
Michael Niedermayer
683ab5fec9
Merge commit 'f2521563d1a0c3e2a21892f59f3327b82b3db7fc'
...
* commit 'f2521563d1a0c3e2a21892f59f3327b82b3db7fc':
g722dec: Change bits_per_codeword to the right option type
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-10-28 13:21:17 +01:00
Michael Niedermayer
252f56636c
Merge commit '97de206b44a48da726807cc3e7b9448a8112760b'
...
* commit '97de206b44a48da726807cc3e7b9448a8112760b':
lavc: disable CRC checking by default
Conflicts:
libavcodec/options_table.h
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-10-28 12:47:10 +01:00
Michael Niedermayer
84f972f994
Merge commit '23a211cbba0b7c9ee694040031b2e5da1be54a00'
...
* commit '23a211cbba0b7c9ee694040031b2e5da1be54a00':
lavc: change all decoders to behave consistently with AV_EF_CRCCHECK.
Conflicts:
libavcodec/avcodec.h
libavcodec/tta.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-10-28 12:34:35 +01:00
Michael Niedermayer
a66ee3dc87
Merge commit 'aaaf2dc023d31f30eeec874f24b50f44b9295185'
...
* commit 'aaaf2dc023d31f30eeec874f24b50f44b9295185':
h263: Check init_get_bits return value
Conflicts:
libavcodec/h263dec.c
See: d47e14b53a
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-10-28 12:09:12 +01:00
Michael Niedermayer
d57a6fe6ab
Merge commit '0749314886390f6ec81d45e0ba424fcb36c945cf'
...
* commit '0749314886390f6ec81d45e0ba424fcb36c945cf':
h263: Return meaningful errors
Conflicts:
libavcodec/h263dec.c
See: 7b62d3415e
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-10-28 11:54:46 +01:00
Michael Niedermayer
ac3fa95e73
Merge commit '94603feb1b3ad01a821a1a1cef1570b13f471821'
...
* commit '94603feb1b3ad01a821a1a1cef1570b13f471821':
h264_ps: when parsing a VUI fails, only abort when explode is set
Merge only for metadata, ignoring invalid data can put the context
into an invalid state and can possibly be used for remote code
execution exploits.
Also we support all non standard VUIs that have been reported so
ignoring parsing failure makes no sense for us unless theres
some issue that has not been reported
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-10-28 11:08:58 +01:00
Mickaël Raulet
a21839149c
hevc: add profile idc warning
...
(cherry picked from commit 15f7a481fd19529b13631bfff5b3d65bfe5729d5)
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-10-28 10:37:11 +01:00
Anton Khirnov
cb148e56dc
hevc: refactor pic_arrays and set_sps
...
(cherry picked from commit a6686c6d83b50c0962269f2c487f4f0c57e0df79)
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-10-28 10:37:10 +01:00
Anton Khirnov
4db81f0817
hevc: add irap checks
...
(cherry picked from commit 3d3bbe35541a308937d0fe72b20a1c29d1c4100d)
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-10-28 10:37:09 +01:00
Michael Niedermayer
8930637819
Merge commit 'fc06ee6ee377cc3b512dff8f02057e26311bc4da'
...
* commit 'fc06ee6ee377cc3b512dff8f02057e26311bc4da':
mmvideo: fix uninitialized variable use in mm_decode_intra
Conflicts:
libavcodec/mmvideo.c
See: c2e3b564b3
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-10-28 10:12:13 +01:00
Anton Khirnov
a1c5cc429d
lavc: don't set AVFrame.pts to random numbers in decoders.
2013-10-28 09:28:29 +01:00
Martin Storsjö
f2521563d1
g722dec: Change bits_per_codeword to the right option type
...
This isn't a set of flags but just a plain integer in the range
6-8.
Signed-off-by: Martin Storsjö <martin@martin.st>
2013-10-28 09:53:48 +02:00
Anton Khirnov
97de206b44
lavc: disable CRC checking by default
2013-10-28 07:22:43 +01:00
Anton Khirnov
23a211cbba
lavc: change all decoders to behave consistently with AV_EF_CRCCHECK.
...
Just crccheck prints a warning, crccheck+explode returns an error.
Also document this behavior.
2013-10-28 07:22:18 +01:00
Anton Khirnov
f354f30836
error resilience: check error_concealment, not err_recognition.
...
err_recognition is supposed to trigger detecting and reporting errors,
not trying to fix them.
2013-10-28 07:22:11 +01:00
Michael Niedermayer
aaaf2dc023
h263: Check init_get_bits return value
...
And use init_get_bits8 to check for integer overflows while at it.
CC: libav-stable@libav.org
Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
2013-10-28 00:04:49 +01:00
Luca Barbato
0749314886
h263: Return meaningful errors
2013-10-28 00:04:49 +01:00
Mickaël Raulet
0ddd3c5ba6
hevc: add decode hrd
...
(cherry picked from commit ab4061dff796b1dd2bc884101226aab48c2c875e)
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-10-27 23:50:35 +01:00
Anton Khirnov
2f77894ccc
hevc: better mt implementation
...
Signed-off-by: Mickaël Raulet <mraulet@insa-rennes.fr>
(cherry picked from commit 93afb8c519deca85b3c97804927de5b016dd32d1)
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-10-27 23:49:50 +01:00
Mickaël Raulet
c1882e801d
hevc: clean up mvs(cherry picked from commit 955317c09b877a513d3fcfcd1615909b2f4f651c)
...
Decreases the difference to Anton Khirnovs patch v5
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-10-27 23:48:43 +01:00
Mickaël Raulet
2707cca78f
hevc: cosmetic change(cherry picked from commit 3b57513b3f39c04337801fb9d159c7ca8dfa9deb)
...
Decreases the difference to Anton Khirnovs patch v5
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-10-27 23:48:11 +01:00
Mickaël Raulet
3106cbd321
hevc: more cosmetic(cherry picked from commit 9697abe41daa234602915f85bf6b1c0ca0252cff)
...
Decreases the difference to Anton Khirnovs patch v5
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-10-27 23:46:54 +01:00
Mickaël Raulet
3c3ece24ea
hevc : cosmetic changes(cherry picked from commit 7308c0ccf13f18cebe4851e6dcd6b5c0b09be1dd)
...
Decreases the difference to Anton Khirnovs patch v5
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-10-27 23:45:34 +01:00
Marton Balint
dbe6f9f2c2
lavc: add support for CODEC_CAP_DELAY in subtitles
...
This patch adds CODEC_CAP_DELAY support to avcodec_decode_subtitle2.
For DVB teletext decoding, a single teletext packet can contain multiple
teletext pages. In order to support that, the teletext decoder may buffer
some pages.
Signed-off-by: Marton Balint <cus@passwd.hu>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-10-27 23:12:41 +01:00
Michael Niedermayer
758b6d39f6
avcodec/hevc: calculate checksum only if AV_EF_EXPLODE is set
...
This avoids a slowdown with the default of enabled CRC checks
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-10-27 22:31:04 +01:00
Michael Niedermayer
69d39cb90c
Revert "avcodec/options_table: disable CRC checking by default"
...
This reverts commit c7027ce9ea
.
It appears there is no complete consensus on this currently.
2013-10-27 22:30:31 +01:00
Michael Niedermayer
e797bd9dc7
Revert "avcodec/options_table: set err_detect to careful by default"
...
This reverts commit b1348eb68b
.
2013-10-27 22:30:00 +01:00
Anton Khirnov
94603feb1b
h264_ps: when parsing a VUI fails, only abort when explode is set
...
A VUI doesn't contain anything strictly necessary for decoding.
Apparently there are many samples with truncated VUIs in the wild, this
commit should allow decoding them.
2013-10-27 21:39:01 +01:00
Vittorio Giovara
fc06ee6ee3
mmvideo: fix uninitialized variable use in mm_decode_intra
...
Signed-off-by: Anton Khirnov <anton@khirnov.net>
2013-10-27 21:32:11 +01:00
Michael Niedermayer
b1348eb68b
avcodec/options_table: set err_detect to careful by default
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-10-27 21:18:50 +01:00
Anton Khirnov
c7027ce9ea
avcodec/options_table: disable CRC checking by default
...
3 runs each of fate-suite/hevc-conformance/ENTP_C_LG_3.bit
with crc flag
1841819858 decicycles in frame decode, 32 runs, 0 skips
1833937180 decicycles in frame decode, 32 runs, 0 skips
1843283884 decicycles in frame decode, 32 runs, 0 skips
without crc flag
1703897301 decicycles in frame decode, 32 runs, 0 skips
1695031879 decicycles in frame decode, 32 runs, 0 skips
1697524383 decicycles in frame decode, 32 runs, 0 skips
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-10-27 21:18:50 +01:00
Michael Niedermayer
2886d6cbb7
avcodec/takdec: also do crc check when er compliant is set
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-10-27 21:18:40 +01:00
Michael Niedermayer
fc7be7ddf3
avcodec/avcodec.h: Add documentation for the AV_EF_* defifines
...
The documentation is copied from the AVOption texts
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-10-27 20:05:36 +01:00
Michael Niedermayer
2ef1e62c8d
correct the AVOption documentation for AV_EF_CAREFUL
...
The flag was and is intended to be a sane default and thus does not enable
time consuming checks. This also matches how the flag is used in decoders and
demuxers.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-10-27 20:03:08 +01:00
Ronald S. Bultje
efc5a54cab
vp9: skip itxfm_add if the whole block has no coefficients.
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-10-27 15:02:48 +01:00
Ronald S. Bultje
960490c0b2
avcodec/x86/videodsp: Small speedups in ff_emulated_edge_mc x86 SIMD.
...
Don't use word-size multiplications if size == 2, and if we're using
SIMD instructions (size >= 8), complete leftover 4byte sets using movd,
not mov. Both of these changes lead to minor speedups.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-10-27 15:02:48 +01:00
Ronald S. Bultje
cd86eb265f
avcodec/x86/videodsp: fix a bug in a %if statement where we used '%%' instead of '&&'.
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-10-27 15:02:48 +01:00
Michael Niedermayer
2c7c2a53b9
vcodec/vc1dec: remove dead code
...
Fixes CID732196
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-10-27 13:34:35 +01:00
Michael Niedermayer
7eda2e524b
avcodec/vc1_parser: check ff_vc1_parse_frame_header*() return value
...
Fixed CID739860
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-10-27 13:28:08 +01:00
Michael Niedermayer
46143d2555
avcodec/tiff: factorize offset init code
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-10-27 13:10:38 +01:00
Michael Niedermayer
d5ad4e4a2f
avcodec/tiff: remove TIFF_LONG special case
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-10-27 13:10:38 +01:00
Michael Niedermayer
0aba920d61
avcodec/tiff: Fix use of uninitialized off variable
...
Fixes CID1108608
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-10-27 13:10:38 +01:00
Michael Niedermayer
09ef98f1ae
avcodec/hevcpred_template: Fix integer overflows
...
signed integer overflow is undefined in C
Fixes the following gcc warnings:
In file included from libavcodec/hevcpred.c:27:0:
libavcodec/hevcpred_template.c: In function ‘intra_pred_8’:
libavcodec/hevcpred_template.c:302:9: warning: assuming signed overflow does not occur when assuming that (X - c) > X is always false [-Wstrict-overflow]
In file included from libavcodec/hevcpred.c:31:0:
libavcodec/hevcpred_template.c: In function ‘intra_pred_9’:
libavcodec/hevcpred_template.c:302:9: warning: assuming signed overflow does not occur when assuming that (X - c) > X is always false [-Wstrict-overflow]
In file included from libavcodec/hevcpred.c:35:0:
libavcodec/hevcpred_template.c: In function ‘intra_pred_10’:
libavcodec/hevcpred_template.c:302:9: warning: assuming signed overflow does not occur when assuming that (X - c) > X is always false [-Wstrict-overflow]
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-10-27 11:54:53 +01:00
Michael Niedermayer
10386710fd
Merge commit 'afa93d198aaf2cc661c4df6d4095cd030265d30a'
...
* commit 'afa93d198aaf2cc661c4df6d4095cd030265d30a':
hevc_parser: Set pict_type, key_frame and output_picture_number.
hevc: Search start code in decode_nal_units().
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-10-27 11:29:37 +01:00
Yusuke Nakamura
afa93d198a
hevc_parser: Set pict_type, key_frame and output_picture_number.
...
Conflicts:
libavcodec/hevc.c
2013-10-27 11:07:43 +01:00
Yusuke Nakamura
f7f8801839
hevc: Search start code in decode_nal_units().
...
User may cut off a weird position and send a packet from there.
This avoids returning as invalid data immediately.
2013-10-27 10:43:14 +01:00
Michael Niedermayer
3b56f665b1
avcodec/flacdec: also do crc check when er compliant is set
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-10-27 09:51:21 +01:00
Anton Khirnov
346e09638c
avcodec/error_resilience check error_concealment, not err_recognition.
...
err_recognition is supposed to trigger detecting and reporting errors,
not trying to fix them.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-10-27 09:51:21 +01:00
Michael Niedermayer
c78a416985
Merge remote-tracking branch 'qatar/master'
...
* qatar/master:
fft-test: add a missing #include
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-10-26 21:59:24 +02:00
Michael Niedermayer
e0b2bdd37a
avcodec/h264_parser: heuristically detect non marked keyframes
...
Fixes Ticket3083
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-10-26 15:56:11 +02:00
Michael Niedermayer
41efb8d9a7
avcodec/x86/cabac: include get_cabac_bypass_sign_x86() under #if !BROKEN_COMPILER
...
this might fix Ticket2999 as well as some fate clients
untested as the original patch submitter no longer has the environment to test
this should be reverted if it does not fix the issues
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-10-26 15:06:55 +02:00
Anton Khirnov
834259528b
fft-test: add a missing #include
...
stdio.h needed for printf since 7177df90a0
2013-10-26 09:11:22 +02:00
Michael Niedermayer
780669ef7c
avcodec/jpeg2000dec: non zero image offsets are not supported
...
Fixes out of array accesses
Fixes Ticket3080
Found-by: ami_stuff
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-10-26 02:19:13 +02:00
Michael Niedermayer
3c9dd93faa
h264: make flush_change() set mmco_reset
...
This ensures that frames do not get mixed on context reinits
Fixes Ticket2836
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-10-26 01:22:38 +02:00
Alex Converse
adea4512c6
aacdec: Fix calls to avpriv_report_missing_feature().
...
It does not take log level as an argument.
2013-10-25 19:41:23 +00:00
Michael Niedermayer
08a8976196
avcodec/h264: reduce noisiness of "mmco: unref short failure"
...
Do not consider it an error if we have no frames and should discard one.
This condition can easily happen when decoding is started from an I frame
Fixes Ticket2811
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-10-25 20:03:29 +02:00
Michael Niedermayer
2e7a1fdd6d
avcodec/twinvq: return the actual number of consumed bytes
...
Fixes Ticket2980
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-10-25 17:25:26 +02:00
Michael Niedermayer
cbb7f56dfe
metasound & twinvqdec: return the number of read bytes from read_bitstream
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-10-25 17:24:07 +02:00
Derek Buitenhuis
7177df90a0
fft-test: Remove possibility of returning restricted exit code
...
Signed-off-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
2013-10-25 11:06:43 +01:00
Derek Buitenhuis
5331d2b93f
dct-test: Remove possibility of returning a restricted exit code
...
Signed-off-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
2013-10-25 11:06:43 +01:00
Michael Niedermayer
4fb14f8492
avcodec/wmalosslessdec: fix data flushing at the end
...
Fixes ffplay -autoexit
Fixes Ticket3000
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-10-25 01:09:59 +02:00
Michael Niedermayer
29ffeef5e7
avcodec/h264: do not trust last_pic_droppable when marking pictures as done
...
This simplifies the code and fixes a deadlock
Fixes Ticket2927
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-10-24 23:15:30 +02:00
Paul B Mahol
ea9632b747
avcodec/flicvideo: use avpriv_request_sample()
...
Signed-off-by: Paul B Mahol <onemda@gmail.com>
2013-10-24 15:31:35 +00:00
Ronald S. Bultje
1b3a7e1f42
avcodec/x86/videodsp: Properly mark sse2 instructions in emulated_edge_mc x86 simd as such.
...
Should fix crashes or corrupt output on pre-SSE2 CPUs when they were
using SSE2-code (e.g. AMD Athlon XP 2400+ or Intel Pentium III) in
hfix or hvar single-edge (left/right) extension functions.
Tested-by: Ingo Brückl <ib@wupperonline.de>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-10-24 13:36:55 +02:00
Derek Buitenhuis
b2fdf3fc35
fft-test: Remove possibility of returning restricted exit code
...
Signed-off-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
2013-10-24 10:53:35 +01:00
Derek Buitenhuis
f80ca1cb00
dct-test: Remove possibility of returning a restricted exit code
...
Signed-off-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
2013-10-24 10:53:10 +01:00
Timothy Gu
07e7bc9cbd
lavc/libmp3lame: add comments about CBR/VBR modes
...
Signed-off-by: Timothy Gu <timothygu99@gmail.com>
Signed-off-by: Stefano Sabatini <stefasab@gmail.com>
2013-10-24 11:32:56 +02:00
Timothy Gu
683d9cb1f2
lavc/libmp3lame: fix alignment and capitalization in AVOptions
...
Signed-off-by: Timothy Gu <timothygu99@gmail.com>
Signed-off-by: Stefano Sabatini <stefasab@gmail.com>
2013-10-24 11:32:56 +02:00
Michael Niedermayer
caac12bd49
Merge remote-tracking branch 'qatar/master'
...
* qatar/master:
golomb: reduce scope of a few variables
Conflicts:
libavcodec/golomb.h
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-10-24 10:44:42 +02:00
Vittorio Giovara
fb13fe8342
golomb: reduce scope of a few variables
...
Signed-off-by: Diego Biurrun <diego@biurrun.de>
2013-10-24 02:04:34 +02:00
Michael Niedermayer
2f31b73a11
avcodec/mpegaudio_tablegen: fix build with hardcoded tables
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-10-24 01:18:37 +02:00
Michael Niedermayer
fbdc98c758
avcodec/metasound_data: Fix inconsistency in tables
...
Fixes out of array read
This issue can be reproduced with:
Lucky.asf
teuflisch.asf
from http://samples.ffmpeg.org/A-codecs/VoxWare/
as well as other samples
fcb16m has 320 elements but the code before the patch can address a
table of 384 elements in its place.
I dont know if theres some elements missing, or its maybe the wrong
table, or if the parameters affecting the table size are wrong, or
if theres something else wrong.
if someone reading this has easy access to some reference. (binary
with the tables in it, spec, whatever, please contact us)
This solution fixes the inconsistency by padding the table with zeros,
this variant was suggested by Vitor Sessak. And ensures that nothing
currently working breaks.
Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-10-23 22:04:29 +02:00
Michael Niedermayer
92f649b411
avcodec/hevc: remove CODEC_CAP_EXPERIMENTAL
...
Approved-by: mraulet
Approved-by: smarter
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-10-23 20:00:11 +02:00
Michael Niedermayer
02a31f6a74
Merge remote-tracking branch 'qatar/master'
...
* qatar/master:
golomb: K&R formatting cosmetics
Conflicts:
libavcodec/golomb.h
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-10-23 19:45:07 +02:00
Michael Niedermayer
4c18c31438
Merge commit '1ce3ec24b35d9d549b12f17bd7fd391abaf3a6f7'
...
* commit '1ce3ec24b35d9d549b12f17bd7fd391abaf3a6f7':
h263: K&R formatting cosmetics
Conflicts:
libavcodec/h263dec.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-10-23 19:37:09 +02:00
Michael Niedermayer
094c40ca37
avcodec/utils: use a default lock manager that uses a pthread mutex
...
That makes avformat & avcodec thread safe without the need to explicitly
register a lock manager.
Reviewed-by: wm4 <nfxjfg@googlemail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-10-23 16:38:06 +02:00
Michael Niedermayer
1e2ab98460
avcodec/vc1dec: use logical operation instead of bitwise for twomv
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-10-23 14:32:04 +02:00
Michael Niedermayer
867e7bb4f1
fix order of operations in comments
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-10-23 14:32:04 +02:00
Vittorio Giovara
2c993e8b5e
golomb: K&R formatting cosmetics
...
Signed-off-by: Diego Biurrun <diego@biurrun.de>
2013-10-23 13:17:23 +02:00
Luca Barbato
1ce3ec24b3
h263: K&R formatting cosmetics
...
Signed-off-by: Vittorio Giovara <vittorio.giovara@gmail.com>
Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
Signed-off-by: Diego Biurrun <diego@biurrun.de>
2013-10-23 13:17:23 +02:00
Michael Niedermayer
435a730e21
avcodec/aacdec: fix more avpriv_report_missing_feature() arguments
...
Found-by: durandal_1707
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-10-23 10:57:16 +02:00
Luca Barbato
72072bf9de
mpegvideo: Drop a faulty assert
...
That check is easily reachable by faulty input.
CC:libav-stable@libav.org
Reported-by: Torsten Sadowski <tsadowski@gmx.net>
2013-10-23 10:49:48 +02:00
Michael Niedermayer
72cf47b241
avcodec/aacdec: fix avpriv_report_missing_feature() arguments
...
Found-by: durandal_1707
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-10-23 10:45:50 +02:00
Michael Niedermayer
fdb4822559
Merge remote-tracking branch 'qatar/master'
...
* qatar/master:
aac: Add support for Enhanced AAC Low Delay (ER AAC ELD).
Conflicts:
Changelog
libavcodec/aacdec.c
libavcodec/version.h
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-10-23 10:02:43 +02:00
Michael Niedermayer
e0f2918223
Merge commit 'f457edb69794c7e13b3630456d72f7942fff19f7'
...
* commit 'f457edb69794c7e13b3630456d72f7942fff19f7':
aacdec: Use avpriv_report_missing_feature() instead of custom logging.
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-10-23 09:53:57 +02:00
Alex Converse
b3be41ca82
aac: Add support for Enhanced AAC Low Delay (ER AAC ELD).
...
This does not include support for LD SBR, epTool, data resilience, nor
the 960 transform family.
2013-10-23 00:08:29 -07:00
Alex Converse
f457edb697
aacdec: Use avpriv_report_missing_feature() instead of custom logging.
2013-10-23 00:08:29 -07:00
Michael Niedermayer
60ea0a5236
avcodec/sgi: Fix dereferencing uninitialized pointer
...
This also fixes the code so it decodes raw images correctly again
No release is affected by this
Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-10-23 02:49:45 +02:00
Michael Niedermayer
610a8b1537
avcodec/hevc/extract_rbsp: fix error return type
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-10-22 20:31:49 +02:00
Mickaël Raulet
0c8aba3842
hevc: add wavefront parallel processing
...
cherry picked from commit b971f2c8fdc60f8bab605a6e8060492eb548a53a
cherry picked from commit e57b0a2c915ce6b8a9d57b8292f6581f0680842e
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-10-22 20:20:40 +02:00
Mickaël Raulet
e146c326b9
avcodec/pthread: add wpp api
...
cherry picked from commit c7765f3295fe7dc0653161c6a3d3e1778b76ee67
cherry picked from commit 0008c4979fc1d1bc24d4d2c791715f6dd017563c
Conflicts:
libavcodec/utils.c
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-10-22 19:55:47 +02:00
Michael Niedermayer
4aeafbaab8
Merge commit '103d073dd7ce23b912df32be8c9524ba25dd5991'
...
* commit '103d073dd7ce23b912df32be8c9524ba25dd5991':
h264_parser: Use ff_h264_reset_sei()
Conflicts:
libavcodec/h264_parser.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-10-22 19:19:28 +02:00
Hendrik Leppkes
c2f3715cb3
vp9: always consume the full input packet
...
Reviewed-by: "Ronald S. Bultje" <rsbultje@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-10-22 18:52:40 +02:00
Michael Niedermayer
88c27193c7
avcodec/vcr1: print the actual size when its insufficient
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-10-22 18:09:20 +02:00
Michael Niedermayer
77ef538818
avcodec/vcr1: Fix bitstream input size check
...
Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-10-22 18:09:20 +02:00
Michael Niedermayer
da30d0cec3
libavcodec/mpegaudio_tablegen: clip value before casting
...
Avoids FPE on alpha
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-10-22 12:48:47 +02:00
Yusuke Nakamura
103d073dd7
h264_parser: Use ff_h264_reset_sei()
...
Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
2013-10-22 10:55:22 +02:00
Michael Niedermayer
19f5384000
h264_parser: Fix order of operations
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
2013-10-22 10:53:04 +02:00
Mickaël Raulet
c68faca68e
hevc: fix transform_skip which is only valid for 4x4(cherry picked from commit 740e5a71e5121dbf3fabdc4fec97829c18ecc2d8)
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-10-22 08:41:14 +02:00
Mickaël Raulet
1c8de4dd94
hevc: pretty print(cherry picked from commit 6332b3afe298b9e1060e8549aea3aa2771b43f5d)
...
Conflicts:
libavcodec/hevc.h
libavcodec/hevc_filter.c
libavcodec/hevc_refs.c
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-10-22 08:41:14 +02:00
Mickaël Raulet
a8fafa8978
hevc: cleaning disable field in deblocking filter(cherry picked from commit 7dd7a27ae850a51b3c9cd07046c422677398f6d5)
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-10-22 08:41:14 +02:00
Mickaël Raulet
1912842045
hevc: remove disable_au option(cherry picked from commit e90b3f6753d645fec076e951a0597a5dc2d2fe31)
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-10-22 08:41:14 +02:00
Michael Niedermayer
d47e14b53a
h263dec: use init_get_bits8() and check its return code
...
Fixes null pointer dereference
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-10-21 23:37:49 +02:00
Michael Niedermayer
2444fca523
Merge commit '5152196b2b47d446d9a509b9bfb318daa26a1f2b'
...
* commit '5152196b2b47d446d9a509b9bfb318daa26a1f2b':
pthread: Avoid spurious wakeups
See: e3329474a3
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-10-21 19:51:21 +02:00
Ben Jackson
5152196b2b
pthread: Avoid spurious wakeups
...
pthread_wait_cond can wake up unexpectedly (Wikipedia: Spurious_wakeup).
The FF_THREAD_SLICE thread mechanism could spontaneously execute
jobs or allow the caller of avctx->execute to return before all
jobs were complete.
Test both cases to ensure the wakeup is real.
Signed-off-by: Ben Jackson <ben@ben.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Signed-off-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
2013-10-21 15:28:03 +02:00
Mickaël Raulet
09ba986cae
avcodec/hevc: fix duplicate/wrong nal unit check and difference to openhevc_upstream
...
NAL_BLA_W_RADL instead of NAL_BLA_N_LP
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-10-21 10:48:24 +02:00
Ronald S. Bultje
fed483f188
avcodec/vp9dsp: fix overwrite by 1 in vert_left pred.
...
The memset following the memcpy was silencing the problem since
re-writing that same byte.
Fixes CID1108597, CID1108598, (16x16)
CID1108599, CID1108600, (8x8)
CID1108601, CID1108602 (32x32)
Signed-off-by: Clément Bœsch <u@pkh.me>
2013-10-20 21:16:53 +02:00
Marton Balint
b2d9790c2b
lavc: make avcodec_decode_subtitle2 more robust
...
Signed-off-by: Marton Balint <cus@passwd.hu>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-10-20 20:35:31 +02:00
Michael Niedermayer
f198efb179
avcodec/vp9: Add asserts to help source code analyzers
...
See CID1108596 and CID1108595
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-10-20 14:46:23 +02:00
Reimar Döffinger
c9a22d69af
hevc: Initialize sample aspect to valid value.
...
Without this, it is 0/0 by default, which is not allowed.
This sets it to 0/1, which means "undefined".
Signed-off-by: Reimar Döffinger <Reimar.Doeffinger@gmx.de>
2013-10-20 12:17:09 +02:00
Mickaël Raulet
1b5a52f425
hevc: pretty print(cherry picked from commit 64a4b623b7d66dfc0f3883e5f1d9125c00c3b18c)
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-10-20 11:08:41 +02:00
Mickaël Raulet
c841d02c05
hevc: fix PPS_A_qualcomm_7(cherry picked from commit 2af177a8761c88eb477a658eebcf4264068aa773)
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-10-20 11:08:32 +02:00
Michael Niedermayer
2e9b79fc00
avcodec/wavpackenc: fix uninitialized ret
...
Fixes CID1108609
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-10-20 02:39:32 +02:00
Michael Niedermayer
6338f1b3c0
avcodec/tiff: remove byte based bpp special case
...
This case does not work as off is uninitialized and it should be
handled fine by the generic code below
Fixes CID1108608
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-10-20 01:50:34 +02:00
Michael Niedermayer
23d69b158a
avcodec/hevc_refs: fix h/vshift calculation in ff_hevc_output_frame()
...
Fixes CID1108577
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-10-20 00:41:00 +02:00
Michael Niedermayer
f2eca8d060
avcodec/hevc: do not dereference pointer before null check in verify_md5()
...
Fixes: CID1108607
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-10-20 00:35:18 +02:00
Michael Niedermayer
acecd6b4d7
avcodec/hevc_cabac: trivial simplifications
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-10-20 00:33:29 +02:00
Mickaël Raulet
b5d197a38b
hevc: inline cabac in hls_mvd_coding(cherry picked from commit ad387195ad04e8a005a1bfd509e9e4f827e68fa9)
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-10-20 00:31:33 +02:00
Mickaël Raulet
92a97d1168
hevc: inline cabac in residual coding(cherry picked from commit 17d7a880445b72feb36d684ae1f0597195811e97)
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-10-20 00:31:25 +02:00
Michael Niedermayer
4c67ed8705
avcodec/hevc: fix EOB/EOS check
...
Fixes: CID1108575
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-10-20 00:23:48 +02:00
Michael Niedermayer
9c0fe487c7
avcodec/h264_parser: fix order of operations
...
Fixes CID1108576
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-10-19 23:44:34 +02:00
Michael Niedermayer
62533eab6f
ffv1enc: use 64bit in maxsize calculation
...
This isnt needed but it cant hurt, its also more consistent with
how its calculated a few lines before.
See: CID1108593
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-10-19 23:36:35 +02:00
Michael Niedermayer
80b1e1c03d
avcodec/exr: fix null pointer dereference
...
Fixes CID1108582
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-10-19 23:28:08 +02:00
Michael Niedermayer
d0812f91c8
avcodec/exr: favor av_freep() over av_free() for saftey
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-10-19 23:27:36 +02:00
Michael Niedermayer
838f461b07
avcodec/utils: add some saftey checks to add_metadata_from_side_data()
...
This fixes potential overreads with crafted files.
Found-by: wm4
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-10-19 17:58:47 +02:00
Michael Niedermayer
240fd8c96f
avcodec/avpacket/av_packet_split_side_data: ensure that side data padding is initialized
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-10-19 17:58:47 +02:00
Michael Niedermayer
d5ec8ba7f2
Do not leave positive values undefined when negative are defined as error
...
Define positive return values as non errors and leave further meaning undefined
This allows future extensions to use these values
Reviewed-by: Paul B Mahol <onemda@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-10-19 16:42:57 +02:00
Carl Eugen Hoyos
10c240a085
avcodec: Add little-endian G726 decoder
...
Fixes part of Ticket1955
suggested by Roman.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-10-18 16:46:08 +02:00
Clément Bœsch
0bf8580354
avcodec/hevcpred: fix make checkheaders.
2013-10-17 21:35:40 +02:00
Mickaël Raulet
a7e300649a
hevc: fix pcm with different chroma luma bit widths(cherry picked from commit 6a444516f338424d062c0ef2806714036283603b)
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-10-17 02:42:11 +02:00
Mickaël Raulet
b494894390
hevc: optimize residual coding(cherry picked from commit 70692a44708157b4dfa50e402e446bfa2b27f55e)
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-10-17 02:41:51 +02:00
Ronald S. Bultje
734ccf3785
avcodec/vp9: fix band_counts array size / padding
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-10-16 17:17:47 +02:00
Paul B Mahol
4413dcc035
avcodec/exr: piz decompression
...
Signed-off-by: Paul B Mahol <onemda@gmail.com>
2013-10-16 14:54:59 +00:00
Michael Niedermayer
4d41a25d39
Merge remote-tracking branch 'qatar/master'
...
* qatar/master:
mpegvideo: Move 8x8 in a separate function
Conflicts:
libavcodec/mpegvideo_motion.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-10-16 15:08:10 +02:00
Michael Niedermayer
8210e38461
Merge commit '95587859cc69e5abe37c9e3af48008032d98e262' into HEAD
...
* commit '95587859cc69e5abe37c9e3af48008032d98e262':
mpegvideo: Move obmc in a separate function
Conflicts:
libavcodec/mpegvideo_motion.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-10-16 14:51:00 +02:00
Michael Niedermayer
8610751d07
Merge commit 'a84616b736fca5ebd6b87489dd41bc06ccdf7860'
...
* commit 'a84616b736fca5ebd6b87489dd41bc06ccdf7860':
mpegvideo: K&R formatting cosmetics
Conflicts:
libavcodec/mpegvideo_motion.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-10-16 13:54:41 +02:00
Michael Niedermayer
10c6d1b28c
Merge commit '93f305473f880729d18b5e42067f19d2106cb2e5'
...
* commit '93f305473f880729d18b5e42067f19d2106cb2e5':
lavc: Convert some remaining strides to ptrdiff_t
Conflicts:
libavcodec/h264.h
libavcodec/mpegvideo_enc.c
libavcodec/mpegvideo_motion.c
libavcodec/vp56.c
libavcodec/wmv2.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-10-16 13:08:37 +02:00
Michael Niedermayer
f7f74a37b8
Merge commit '4baba6c813b7a1f27370e20fb1a87b05fcb39208'
...
* commit '4baba6c813b7a1f27370e20fb1a87b05fcb39208':
h264_parser: Fix POC parsing for the case where MMCO_RESET is present.
Conflicts:
libavcodec/h264.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-10-16 12:51:26 +02:00
Michael Niedermayer
91248f081f
Merge commit 'b81dbd6cb7522bea96d78a52f8a4c25a47b820c9'
...
* commit 'b81dbd6cb7522bea96d78a52f8a4c25a47b820c9':
h264_parser: Fix POC parsing for the case where MMCO_RESET is absent.
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-10-16 12:39:02 +02:00
Michael Niedermayer
3a8b52c011
Merge commit '3b4fa54866f58bf3d8a8dcc460c73ef6564c0ad8'
...
* commit '3b4fa54866f58bf3d8a8dcc460c73ef6564c0ad8':
cavs: more K&R formatting cosmetics
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-10-16 11:12:23 +02:00
Mickaël Raulet
64b3aaf8f6
hevc: fixing TSCL_A_VIDYO_5 decoding output order(cherry picked from commit 19c5d9ed28606e7a166d180fc9f1517cb174146f)
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-10-16 01:48:11 +02:00
gcocherel
cf49d0156d
valgrind cleanup(cherry picked from commit 0d5efa40b94c0de92a1fe5091b21e0e2d36bae3d)
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-10-16 00:17:28 +02:00
Luca Barbato
825c7c62bb
mpegvideo: Move 8x8 in a separate function
2013-10-15 23:58:20 +02:00
Luca Barbato
95587859cc
mpegvideo: Move obmc in a separate function
2013-10-15 23:58:20 +02:00
Luca Barbato
a84616b736
mpegvideo: K&R formatting cosmetics
2013-10-15 23:58:20 +02:00
Ronald S. Bultje
93f305473f
lavc: Convert some remaining strides to ptrdiff_t
2013-10-15 23:58:20 +02:00
Luca Barbato
a90905db2e
ffv1: Assume bitdepth 0 means 8bit
...
CC: libav-stable@libav.org
Reported-by: debian/726189
2013-10-15 23:58:20 +02:00
Michael Niedermayer
f2dd45d06c
lavc/hevc: mark decoder as experimental
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-10-15 22:13:02 +02:00
Michael Niedermayer
af980aa4f6
lavc/hevc_ps: fix PIX_FMT enums
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-10-15 22:13:02 +02:00
Guillaume Martres
c8dd048ab8
lavc: add a HEVC decoder.
...
Initially written by Guillaume Martres <smarter@ubuntu.com> as a GSoC
project. Further contributions by the OpenHEVC project and other
developers, namely:
Mickaël Raulet <mraulet@insa-rennes.fr>
Seppo Tomperi <seppo.tomperi@vtt.fi>
Gildas Cocherel <gildas.cocherel@laposte.net>
Khaled Jerbi <khaled_jerbi@yahoo.fr>
Wassim Hamidouche <wassim.hamidouche@insa-rennes.fr>
Vittorio Giovara <vittorio.giovara@gmail.com>
Jan Ekström <jeebjp@gmail.com>
Anton Khirnov <anton@khirnov.net>
Martin Storsjö <martin@martin.st>
Luca Barbato <lu_zero@gentoo.org>
Yusuke Nakamura <muken.the.vfrmaniac@gmail.com>
Signed-off-by: Anton Khirnov <anton@khirnov.net>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-10-15 22:13:02 +02:00
Michael Niedermayer
2a19fcc123
avcodec/mpegaudio_tablegen: remove dead branch
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-10-15 21:43:32 +02:00
Michael Niedermayer
59352a07d8
avcodec: improve precission for cbrtf() emulation
...
cbrtf() took floats but it represented 1/3 exactly
and even if not more precission should be better in theory
for the table generation
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-10-15 21:03:03 +02:00
Yusuke Nakamura
4baba6c813
h264_parser: Fix POC parsing for the case where MMCO_RESET is present.
...
Signed-off-by: Anton Khirnov <anton@khirnov.net>
2013-10-15 20:02:55 +02:00
Yusuke Nakamura
b81dbd6cb7
h264_parser: Fix POC parsing for the case where MMCO_RESET is absent.
...
The prev_ values were not set after parsing POC.
Increase length of the buffer decoded to parse enough safely.
Signed-off-by: Anton Khirnov <anton@khirnov.net>
2013-10-15 20:02:47 +02:00
Diego Biurrun
29c455ce3d
bitstream: Check the result of av_malloc()
2013-10-15 18:01:12 +02:00
Diego Biurrun
3b4fa54866
cavs: more K&R formatting cosmetics
2013-10-15 18:01:11 +02:00
Derek Buitenhuis
c0085f94fe
mpegaudio_tablegen: Don't use llrint
...
You cannot count on it being present on all systems, and you
cannot include libm.h in a host tool, so just hard code a baseline
implementation.
Signed-off-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
2013-10-15 17:00:28 +01:00
Derek Buitenhuis
479a527955
cos_tablegen: Don't use lrint
...
You cannot count on it being present on all systems, and you
cannot include libm.h in a host tool, so just hard code a baseline
implementation.
Signed-off-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
2013-10-15 17:00:28 +01:00
Derek Buitenhuis
bc31a7a3b6
tablegen: Don't use cbrtf in host tools
...
You cannot count on them being present on all systems, and you
cannot include libm.h in a host tool, so just hard code baseline
implementations.
Signed-off-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
2013-10-15 17:00:28 +01:00
Derek Buitenhuis
884fd4d259
tableprint: Fix use of a size_t print with MSVC
...
%zu was introduced in C99, so MSVC has its own way to handle it,
namely %Iu.
Signed-off-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
2013-10-15 17:00:28 +01:00
Derek Buitenhuis
e516921143
mpegaudio_tablegen: Don't use llrint
...
You cannot count on it being present on all systems, and you
cannot include libm.h in a host tool, so just hard code a baseline
implementation.
Signed-off-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
2013-10-15 16:52:16 +01:00
Derek Buitenhuis
5086720993
cos_tablegen: Don't use lrint
...
You cannot count on it being present on all systems, and you
cannot include libm.h in a host tool, so just hard code a baseline
implementation.
Signed-off-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
2013-10-15 16:52:12 +01:00
Derek Buitenhuis
008014b5e7
tablegen: Don't use cbrtf in host tools
...
You cannot count on them being present on all systems, and you
cannot include libm.h in a host tool, so just hard code baseline
implementations.
Signed-off-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
2013-10-15 16:52:07 +01:00
Derek Buitenhuis
00aa24ffee
tableprint: Fix use of a size_t print with MSVC
...
%zu was introduced in C99, so MSVC has its own way to handle it,
namely %Iu.
Signed-off-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
2013-10-15 16:51:58 +01:00
Michael Niedermayer
a1b9004b76
avcodec/jpeg2000dec: fix context consistency with too large lowres
...
Fixes out of array accesses
Fixes Ticket2898
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-10-15 14:30:17 +02:00
Michael Niedermayer
c35d29a9c8
avcodec/x86/dsputil_init: move ff_idct_xvid_mmxext init
...
This decreases the diff to libav
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-10-15 02:06:12 +02:00
Michael Niedermayer
ab8cbfe0dd
avcodec/x86/dsputil_init: remove duplicated sse2 idct init
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-10-15 01:59:36 +02:00
Michael Niedermayer
1bf8fa75ee
avcodec/x86/dsputil_init: fix cpu flag checks
...
Fixes linking failure with --disable-sse2
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-10-15 01:46:21 +02:00
Vignesh Venkatasubramanian
0f99aad80f
lavc: Adding seek_preroll to AVCodecContext
...
seek_preroll field is added to the AVCodecContext struct. It indicates
the number of samples to be discarded whenever there is a discontinuity.
The minor version is bumped accordingly.
Signed-off-by: Vignesh Venkatasubramanian <vigneshv@google.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-10-14 18:46:12 +02:00
Michael Niedermayer
8d9f08ef32
Merge remote-tracking branch 'qatar/master'
...
* qatar/master:
cavs: Check for negative cbp
Conflicts:
libavcodec/cavsdec.c
See: 9f06c1c61e
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-10-14 10:18:36 +02:00
Michael Niedermayer
d794b7db14
Merge commit '1b20d0f581f01f2df601c9e68d0d321672d97af7'
...
* commit '1b20d0f581f01f2df601c9e68d0d321672d97af7':
cavs: Return meaningful error values
Conflicts:
libavcodec/cavsdec.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-10-14 02:10:43 +02:00
Michael Niedermayer
fb8a10db5d
Merge commit '14ddbb477faef359983151b763fd8b20e578651b'
...
* commit '14ddbb477faef359983151b763fd8b20e578651b':
cavs: K&R formatting cosmetics
Conflicts:
libavcodec/cavs.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-10-14 02:04:38 +02:00
Michael Niedermayer
fe448cd28d
avcodec/jpeg2000dec: prevent out of array accesses in pixel addressing
...
Fixes Ticket2921
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-10-13 21:48:36 +02:00
Michael Niedermayer
e54f4510aa
avcodec/jpeg2000: zero i/f_data
...
Fixes uninitialized use of variables
Fixes part of Ticket2921
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-10-13 21:48:28 +02:00
Michael Niedermayer
ac3b01a9c0
avcodec/jpeg2000dec: check transform equality in MCT
...
Fixes null pointer dereference
Fixes Ticket2843
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-10-13 19:23:24 +02:00
Luca Barbato
39185ec4fa
cavs: Check for negative cbp
...
Sample-Id: 00000647-google
Reported-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
CC: libav-stable@libav.org
2013-10-13 17:52:53 +02:00
Luca Barbato
1b20d0f581
cavs: Return meaningful error values
2013-10-13 17:52:53 +02:00
Luca Barbato
14ddbb477f
cavs: K&R formatting cosmetics
2013-10-13 17:52:53 +02:00
Derek Buitenhuis
eb90a2091f
pthread: Fix deadlock during thread initialization
...
Sometimes, if pthread_create() failed, then pthread_cond_wait() could
accidentally be called in the worker threads after the uninit function
had already called pthread_cond_broadcast(), leading to a deadlock.
Don't call pthread_cond_wait() if c->done is set.
Signed-off-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
2013-10-13 05:50:00 -04:00
Michael Niedermayer
43dec5ef9a
Merge remote-tracking branch 'qatar/master'
...
* qatar/master:
indeo4: Check the inherited quant_mat
Conflicts:
libavcodec/indeo4.c
See: 884efd4e09
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-10-13 10:38:51 +02:00
Michael Niedermayer
d3850ac5b9
Merge commit '0cb83c563848bf8f8365e7bd30e7e6b57ef360f0'
...
* commit '0cb83c563848bf8f8365e7bd30e7e6b57ef360f0':
indeo4: Check the block size if reusing the band configuration
Conflicts:
libavcodec/indeo4.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-10-13 10:19:15 +02:00
Michael Niedermayer
40ade07141
Merge commit '16ea20c827ef2ffaf77d5e05d5cf9983689f7b2b'
...
* commit '16ea20c827ef2ffaf77d5e05d5cf9983689f7b2b':
lavc doxy: extend/clarify avcodec_decode_audio4() doxy
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-10-13 08:17:01 +02:00
Michael Niedermayer
29d64b1d8e
Merge commit '66d3f5fd5ca4cb3d09b52ad1041cd4359325a21a'
...
* commit '66d3f5fd5ca4cb3d09b52ad1041cd4359325a21a':
lavc doxy: remove false statements about alignment requirements.
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-10-13 08:09:28 +02:00
Luca Barbato
c9ef6b0932
indeo4: Check the inherited quant_mat
...
Invalidate it if not supported.
Sample-Id: 00000262-google
Reported-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
CC: libav-stable@libav.org
2013-10-13 01:38:21 +02:00
Luca Barbato
0cb83c5638
indeo4: Check the block size if reusing the band configuration
...
Sample-Id: 00000287-google
Reported-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
CC: libav-stable@libav.org
2013-10-13 01:38:20 +02:00
Michael Niedermayer
87fe0bbd69
lavc: rename h265 to hevc, add AV_CODEC_ID_H265 with identical value for backward compatibility
...
Somehow 2 different identifiers have come into existence which makes supporting
both until the next major version bump required
I did not investigate how exactly that did happen.
wm4, j-b and smarter prefer hevc.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-10-13 00:26:27 +02:00
Anton Khirnov
16ea20c827
lavc doxy: extend/clarify avcodec_decode_audio4() doxy
...
Elaborate on flushing the decoder.
2013-10-12 15:10:21 +02:00
Anton Khirnov
66d3f5fd5c
lavc doxy: remove false statements about alignment requirements.
...
The packet data does not need to be aligned.
2013-10-12 15:09:38 +02:00
Michael Niedermayer
e7fa0417b3
Merge remote-tracking branch 'qatar/master'
...
* qatar/master:
prores: Reject negative run and level values
See: 93c220e895
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-10-11 16:48:26 +02:00
Michael Niedermayer
bb8ce36dc2
Merge commit '5f5ada3dbf97e306a74250ba8dcf8619ad59b020'
...
* commit '5f5ada3dbf97e306a74250ba8dcf8619ad59b020':
shorten: Fix out-of-array read
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-10-11 09:20:26 +02:00
Luca Barbato
c0de9a23c7
prores: Reject negative run and level values
...
Sample-Id: 00000611-google
Reported-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
CC: libav-stable@libav.org
2013-10-10 21:02:10 +02:00
Paul B Mahol
996c73490c
avcodec/exr: remove pointless initialization
...
Signed-off-by: Paul B Mahol <onemda@gmail.com>
2013-10-10 18:24:49 +00:00
Maxim Poliakovski
2d52834910
atrac3: Better name for imdct window initialization
...
Patch by Diego Biurrun.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-10-10 18:33:16 +02:00
Maxim Poliakovski
4fb8de08e1
atrac3: Remove unused gain compensation tables
...
Patch by Diego Biurrun.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-10-10 18:33:07 +02:00
Tim Walker
5f5ada3dbf
shorten: Fix out-of-array read
...
pred_order == FF_ARRAY_ELEMS(fixed_coeffs) is invalid too.
Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
2013-10-10 17:52:14 +02:00
Maxim Poliakovski
ed796fba76
atrac3: Better name for IMDCT window initialization
...
Signed-off-by: Diego Biurrun <diego@biurrun.de>
2013-10-10 14:29:54 +02:00
Maxim Poliakovski
be76415047
atrac3: Remove unused gain compensation tables
...
Signed-off-by: Diego Biurrun <diego@biurrun.de>
2013-10-10 14:26:13 +02:00
Ronald S. Bultje
20d78a8606
libavcodec/x86: Fix emulated_edge_mc SSE code to not contain SSE2 instructions on x86-32.
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-10-10 13:36:06 +02:00
Michael Niedermayer
ef6b85e9b8
avcodec/proresdec2: propagate error codes
...
Based-on: 44690dfa68
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-10-10 13:11:54 +02:00
Michael Niedermayer
0391f4617f
avcodec/vmnc/reset_buffers(): reset cur_hx/hy too for saftey
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-10-10 12:30:52 +02:00
Michael Niedermayer
3fa4c528a9
Merge remote-tracking branch 'qatar/master'
...
* qatar/master:
prores: Error out only on surely incomplete ac_coeffs
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-10-10 12:29:17 +02:00
Michael Niedermayer
5c99ca2288
Merge commit '44690dfa683f620c77e9f0e8e9bc5682608636b1'
...
* commit '44690dfa683f620c77e9f0e8e9bc5682608636b1':
prores: Add a codepath for decoding errors
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-10-10 12:21:15 +02:00
Michael Niedermayer
70025c07a7
Merge commit '41a10f3ba149a2012de499d0b4ad4955d81f28d5'
...
* commit '41a10f3ba149a2012de499d0b4ad4955d81f28d5':
vp6: Support cropping to AVCodecContext.width/height
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-10-10 11:38:36 +02:00
Michael Niedermayer
e96c80154f
Merge commit '1018a92219a38a812cf97761c6b3a5e66a400f4b'
...
* commit '1018a92219a38a812cf97761c6b3a5e66a400f4b':
jpeg2000: Check block length
See: 914ab4cd1c
See: 582f53349e
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-10-10 10:32:04 +02:00
Luca Barbato
2df7f7714a
prores: Error out only on surely incomplete ac_coeffs
2013-10-10 10:26:31 +02:00
Luca Barbato
44690dfa68
prores: Add a codepath for decoding errors
2013-10-10 09:47:03 +02:00
Michael Niedermayer
5a7a902ac3
Merge commit '071e29af4d383bdb44d0c87416dee3e4bb597936'
...
* commit '071e29af4d383bdb44d0c87416dee3e4bb597936':
vmnc: Use meaningful return values
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-10-10 09:45:30 +02:00
Martin Storsjö
41a10f3ba1
vp6: Support cropping to AVCodecContext.width/height
...
In these cases, there is no extradata but only the properly set
width/height values by the demuxer.
This makes sure VP6 in F4V files is cropped properly.
This is similar to what is done for H264 for letting the container
width/height override what's in the bitstream, since 30f515091
.
Signed-off-by: Martin Storsjö <martin@martin.st>
2013-10-10 10:41:21 +03:00
Michael Niedermayer
20669753ce
Merge commit '5e992a4682d2c09eed3839c6cacf70db3b65c2f4'
...
* commit '5e992a4682d2c09eed3839c6cacf70db3b65c2f4':
vmnc: Check the cursor dimensions
Conflicts:
libavcodec/vmnc.c
See: 9437259276
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-10-10 09:39:07 +02:00
Michael Niedermayer
f18db82f29
Merge commit '61cd19b8bc32185c8caf64d89d1b0909877a0707'
...
* commit '61cd19b8bc32185c8caf64d89d1b0909877a0707':
vmnc: Port to bytestream2
Conflicts:
libavcodec/vmnc.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-10-10 09:19:05 +02:00
Michael Niedermayer
7824b5f6f5
Merge commit 'a66aa0daf290ef157cb3322b034b43d6201c43e9'
...
* commit 'a66aa0daf290ef157cb3322b034b43d6201c43e9':
vmnc: K&R formatting cosmetics
Conflicts:
libavcodec/vmnc.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-10-10 09:04:22 +02:00
Michael Niedermayer
65c2fe7159
avcodec/h264: call flush_change() on init
...
This ensures that all the non zero fields get setup correctly.
Alternatively their initialization could be duplicated.
Fixes Ticket2738
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-10-10 02:25:51 +02:00
Michael Niedermayer
5ac6b6028f
avcodec/h264_refs: modify key frame detection heuristic to detect more cases
...
Fixes Ticket2968
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-10-10 00:07:26 +02:00
Luca Barbato
1018a92219
jpeg2000: Check block length
...
Reported-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
CC: libav-stable@libav.org
2013-10-09 22:25:19 +02:00
Luca Barbato
071e29af4d
vmnc: Use meaningful return values
2013-10-09 22:25:01 +02:00
Luca Barbato
5e992a4682
vmnc: Check the cursor dimensions
...
And manage the reallocation failure path.
Reported-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
CC: libav-stable@libav.org
2013-10-09 22:25:01 +02:00
Luca Barbato
61cd19b8bc
vmnc: Port to bytestream2
...
Fix some buffer overreads.
Reported-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
CC: libav-stable@libav.org
2013-10-09 22:25:01 +02:00
Luca Barbato
a66aa0daf2
vmnc: K&R formatting cosmetics
...
Signed-off-by: Diego Biurrun <diego@biurrun.de>
2013-10-09 22:25:01 +02:00
Paul B Mahol
8c7bc7d3e5
avcodec/exr: use avpriv_report_missing_feature()
...
Signed-off-by: Paul B Mahol <onemda@gmail.com>
2013-10-09 13:46:44 +00:00
Paul B Mahol
19fda0a1bc
avcodec/vmnc: use av_freep()
...
Signed-off-by: Paul B Mahol <onemda@gmail.com>
2013-10-09 12:54:45 +00:00
Michael Niedermayer
7f22df3a49
Merge remote-tracking branch 'qatar/master'
...
* qatar/master:
shorten: Extend fixed_coeffs to properly support pred_order 0
Conflicts:
libavcodec/shorten.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-10-09 11:04:06 +02:00
Carl Eugen Hoyos
3aabfaa37b
Fix make checkheaders for vp9 header files.
2013-10-09 09:42:16 +02:00
Luca Barbato
b2148faca9
shorten: Extend fixed_coeffs to properly support pred_order 0
...
Reported-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
CC: libav-stable@libav.org
2013-10-09 03:34:10 +02:00
Paul B Mahol
85b56e4803
avcodec/xwddec: use avpriv_report_missing_feature
...
Signed-off-by: Paul B Mahol <onemda@gmail.com>
2013-10-08 12:40:33 +00:00
Paul B Mahol
3abbf20962
dpx: abgr support
...
Signed-off-by: Paul B Mahol <onemda@gmail.com>
2013-10-08 12:40:33 +00:00
Ronald S. Bultje
ad75d2b590
x86: Fix compilation with nasm on PPC & OS/2
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-10-08 12:36:19 +02:00
Michael Niedermayer
deb5addcff
Merge remote-tracking branch 'qatar/master'
...
* qatar/master:
x86: h264_idct: Update comments to match 8/10-bit depth optimization split
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-10-08 12:10:02 +02:00
Michael Niedermayer
1f17619fe4
Merge commit 'bbe4a6db44f0b55b424a5cc9d3e89cd88e250450'
...
* commit 'bbe4a6db44f0b55b424a5cc9d3e89cd88e250450':
x86inc: Utilize the shadow space on 64-bit Windows
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-10-08 11:23:00 +02:00
Ronald S. Bultje
ba9c557b92
avcodec/x86/vp9dsp: Fix compilation with nasm.
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-10-08 02:27:12 +02:00
Diego Biurrun
6405ca7d4a
x86: h264_idct: Update comments to match 8/10-bit depth optimization split
2013-10-07 21:46:46 +02:00
Michael Niedermayer
abf2d53d80
avcodec/options_table: add field_order
...
This allows setting and overriding the field order
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-10-07 18:23:20 +02:00
Paul B Mahol
23824b9698
avcodec/dpx: support for 8 and 16 bit luma only files
...
Signed-off-by: Paul B Mahol <onemda@gmail.com>
2013-10-07 11:45:46 +00:00
Paul B Mahol
e745dc2d6f
avcodec/dpx: refactor pixel format selection
...
Signed-off-by: Paul B Mahol <onemda@gmail.com>
2013-10-07 11:45:46 +00:00
Henrik Gramner
bbe4a6db44
x86inc: Utilize the shadow space on 64-bit Windows
...
Store XMM6 and XMM7 in the shadow space in functions that
clobbers them. This way we don't have to adjust the stack
pointer as often, reducing the number of instructions as
well as code size.
Signed-off-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
2013-10-07 06:25:35 -04:00
Michael Niedermayer
b67cb58520
Merge remote-tracking branch 'qatar/master'
...
* qatar/master:
x86: fdct: Employ more specific ifdefs
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-10-07 11:37:47 +02:00
Paul B Mahol
62078f25ee
avcodec/dpx: return different error code for unsupported depths
...
Also give better message in such cases.
Signed-off-by: Paul B Mahol <onemda@gmail.com>
2013-10-07 09:10:00 +00:00
Michael Niedermayer
630c005b87
avcodec/flac_parser: export sample_rate also when PARSER_FLAG_COMPLETE_FRAMES is set
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-10-07 01:36:05 +02:00
Paul B Mahol
ee3d03bf4e
avcodec/dpx: make .long_name more descriptive
...
Signed-off-by: Paul B Mahol <onemda@gmail.com>
2013-10-06 20:17:10 +00:00
Paul B Mahol
8ec328668a
avcodec: add dpx parser
...
Signed-off-by: Paul B Mahol <onemda@gmail.com>
2013-10-06 20:12:37 +00:00
Diego Biurrun
ce1e8045e0
x86: fdct: Employ more specific ifdefs
...
This avoids building mmxext and sse2 code when disabled by configure.
2013-10-06 22:02:25 +02:00
Michael Niedermayer
c86955d24a
Merge commit '2ddb35b91131115c094d90e04031451023441b4d'
...
* commit '2ddb35b91131115c094d90e04031451023441b4d':
x86: dsputil: Separate ff_add_hfyu_median_prediction_cmov from dsputil_mmx
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-10-06 11:50:01 +02:00
Michael Niedermayer
7fb123429e
Merge commit '258414d0771845d20f646ffe4d4e60f22fba217c'
...
* commit '258414d0771845d20f646ffe4d4e60f22fba217c':
x86: fdct: Initialize optimized fdct implementations in the standard way
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-10-06 11:31:01 +02:00
Michael Niedermayer
d0b2703676
Merge commit '0b8b2ae5e93d616c2ece59f7175f483154cff918'
...
* commit '0b8b2ae5e93d616c2ece59f7175f483154cff918':
x86: xviddct: Employ more specific ifdefs
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-10-06 11:25:22 +02:00
Diego Biurrun
2ddb35b911
x86: dsputil: Separate ff_add_hfyu_median_prediction_cmov from dsputil_mmx
...
The function does not depend on MMX and compilation without MMX enabled
fails if the function is compiled conditional on MMX availability.
2013-10-05 19:21:15 +02:00
Diego Biurrun
258414d077
x86: fdct: Initialize optimized fdct implementations in the standard way
2013-10-05 18:20:52 +02:00
Diego Biurrun
0b8b2ae5e9
x86: xviddct: Employ more specific ifdefs
...
This avoids building mmxext and sse2 code when disabled by configure.
2013-10-05 18:14:58 +02:00
Paul B Mahol
fc83c99c0b
avcodec/dpx: cosmetics: fix identation
...
Signed-off-by: Paul B Mahol <onemda@gmail.com>
2013-10-05 12:27:31 +00:00
Paul B Mahol
0841652b54
avcodec/dpx: reformat avpriv_report_missing_feature messages
...
Signed-off-by: Paul B Mahol <onemda@gmail.com>
2013-10-05 12:26:45 +00:00
Paul B Mahol
c3e0fbc507
avcodec/dpx: return proper error code for unsupported files
...
Also use avpriv_report_missing_feature().
Signed-off-by: Paul B Mahol <onemda@gmail.com>
2013-10-05 12:26:21 +00:00
Michael Niedermayer
a927276fcc
avcodec/dpx: check packing
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-10-05 01:41:44 +02:00
Michael Niedermayer
23f105a830
avcodec/dpx: check encoding
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-10-05 01:41:44 +02:00
Michael Niedermayer
fb726ef09a
avcodec/dpx: fix reading of the packing field
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-10-05 01:33:52 +02:00
Michael Niedermayer
8cb7d20567
avcodec/dpx: fix reading 12bit dpx images, which have non zero padding bits
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-10-05 01:31:15 +02:00
Michael Niedermayer
9d8e8495c9
Merge remote-tracking branch 'qatar/master'
...
* qatar/master:
x86: fdct: Only build fdct code if encoders have been enabled
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-10-04 14:36:58 +02:00
Clément Bœsch
b46f19100b
cosmetics: group remaining .name and .long_name.
...
See b2bed9325
.
2013-10-04 13:33:20 +00:00
Michael Niedermayer
ee77140afa
Merge commit 'b2bed9325dbd6be0da1d91ffed3f513c40274fd2'
...
* commit 'b2bed9325dbd6be0da1d91ffed3f513c40274fd2':
cosmetics: Group .name and .long_name together in codec/format declarations
Conflicts:
libavcodec/8svx.c
libavcodec/alac.c
libavcodec/cljr.c
libavcodec/dnxhddec.c
libavcodec/dnxhdenc.c
libavcodec/dpxenc.c
libavcodec/dvdec.c
libavcodec/dvdsubdec.c
libavcodec/dvdsubenc.c
libavcodec/ffv1dec.c
libavcodec/flacdec.c
libavcodec/flvdec.c
libavcodec/fraps.c
libavcodec/frwu.c
libavcodec/g726.c
libavcodec/gif.c
libavcodec/gifdec.c
libavcodec/h261dec.c
libavcodec/h263dec.c
libavcodec/iff.c
libavcodec/imc.c
libavcodec/libopencore-amr.c
libavcodec/libopenjpegdec.c
libavcodec/libopenjpegenc.c
libavcodec/libspeexenc.c
libavcodec/libvo-amrwbenc.c
libavcodec/libvorbisenc.c
libavcodec/libvpxenc.c
libavcodec/libx264.c
libavcodec/libxavs.c
libavcodec/libxvid.c
libavcodec/ljpegenc.c
libavcodec/mjpegbdec.c
libavcodec/mjpegdec.c
libavcodec/mpeg12dec.c
libavcodec/mpeg4videodec.c
libavcodec/msmpeg4dec.c
libavcodec/pgssubdec.c
libavcodec/pngdec.c
libavcodec/pngenc.c
libavcodec/proresdec_lgpl.c
libavcodec/proresenc_kostya.c
libavcodec/ra144enc.c
libavcodec/rawdec.c
libavcodec/rv10.c
libavcodec/sp5xdec.c
libavcodec/takdec.c
libavcodec/tta.c
libavcodec/v210dec.c
libavcodec/vp6.c
libavcodec/wavpack.c
libavcodec/xbmenc.c
libavcodec/yop.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-10-04 12:34:23 +02:00
Diego Biurrun
6cc133ec58
x86: fdct: Only build fdct code if encoders have been enabled
...
fdct is only initialized if encoders are enabled.
2013-10-04 10:50:44 +02:00
Clément Bœsch
95cafeb684
avcodec/dvdsubdec: reconstruct incomplete SPU packets.
2013-10-04 07:59:48 +02:00
Clément Bœsch
71e0ae22ac
avcodec/dvdsubdec: extract every subtitle in a different file (debug).
...
Even thought a generic solution would be more relevant, this is
currently helpful while debugging.
2013-10-04 07:59:48 +02:00
Clément Bœsch
41fd6f0796
avcodec/dvdsubdec: factor out rectangles reset.
2013-10-04 07:59:48 +02:00
Diego Biurrun
b2bed9325d
cosmetics: Group .name and .long_name together in codec/format declarations
2013-10-03 23:32:01 +02:00
Maxim Poliakovski
6a5bfd4d49
atrac: Add missing av_cold
...
Signed-off-by: Diego Biurrun <diego@biurrun.de>
2013-10-03 23:00:09 +02:00
Maxim Poliakovski
79cbac8cd4
atrac3: Generalize gain compensation code
...
Move it to the ATRAC common code, to reuse in the upcoming ATRAC3+ decoder.
Signed-off-by: Diego Biurrun <diego@biurrun.de>
2013-10-03 18:20:01 +02:00
Diego Biurrun
5ce04c14dd
Use correct Doxygen syntax
2013-10-03 17:53:51 +02:00
Maxim Poliakovski
4be292dac7
atrac: Move doxygen comments to the header
...
Also update copyright info and file description.
Signed-off-by: Diego Biurrun <diego@biurrun.de>
2013-10-03 17:53:51 +02:00
Diego Biurrun
be0b4c70ec
atrac3: Replace a silly counter variable name with plain 'j'
2013-10-03 17:53:51 +02:00
Michael Niedermayer
4a63c69faa
Merge remote-tracking branch 'qatar/master'
...
* qatar/master:
atrac3: Generalize gain compensation code
Conflicts:
libavcodec/atrac.c
libavcodec/atrac.h
libavcodec/atrac3.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-10-03 21:46:42 +02:00
Michael Niedermayer
2ece7d94bc
Merge commit '5ce04c14dd3dd3670cbdba82275a3a72c716ec6f'
...
* commit '5ce04c14dd3dd3670cbdba82275a3a72c716ec6f':
Use correct Doxygen syntax
Conflicts:
libavcodec/atrac3.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-10-03 21:29:38 +02:00
Michael Niedermayer
16bb8faac6
Merge commit '4be292dac7e7f0586053fcced8d530ccf4ebef29'
...
* commit '4be292dac7e7f0586053fcced8d530ccf4ebef29':
atrac: Move doxygen comments to the header
Conflicts:
libavcodec/atrac.c
libavcodec/atrac.h
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-10-03 21:22:55 +02:00
Michael Niedermayer
c2df95978b
Merge commit 'be0b4c70ec40d7f9ac8e416a4379d4a387421184'
...
* commit 'be0b4c70ec40d7f9ac8e416a4379d4a387421184':
atrac3: Replace a silly counter variable name with plain 'j'
Conflicts:
libavcodec/atrac3.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-10-03 21:14:54 +02:00
Michael Niedermayer
6565b1ad97
avcodec/h264_sei: make SEI type truncated message more informative
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-10-03 20:13:55 +02:00
Michael Niedermayer
fcd19d6c8d
avcodec/jpeg2000dec: Zero code and quant style
...
This prevents future frames from using half initialized/inconsistent
structures
Fixes assertion failure
Fixes Ticket2897
Reviewed-by: Paul B Mahol <onemda@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-10-03 19:03:56 +02:00
Michael Niedermayer
1c71f185ad
avcodec/tiff_common: Improve formating of long arrays
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-10-03 18:47:50 +02:00
Michael Niedermayer
e57dba0d52
avcodec: add av_codec_get_max_lowres()
...
Reviewed-by: Stefano Sabatini <stefasab@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-10-03 16:33:09 +02:00
Michael Niedermayer
4c292d5c34
Merge remote-tracking branch 'rbultje/master'
...
* rbultje/master:
Full-pixel MC functions.
VP9 MC (ssse3) optimizations.
Native VP9 decoder.
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-10-03 13:56:52 +02:00
Michael Niedermayer
5a63fb6693
Merge remote-tracking branch 'qatar/master'
...
* qatar/master:
lavc: mark deprecated AVCodec.max_lowres for removal on next bump
Conflicts:
libavcodec/avcodec.h
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-10-03 12:04:37 +02:00
Ronald S. Bultje
f1548c008f
Full-pixel MC functions.
...
Decoding time of ped1080p.webm goes from 11.3sec to 11.1sec.
2013-10-02 21:03:15 -04:00
Ronald S. Bultje
c07ac8d467
VP9 MC (ssse3) optimizations.
...
Decoding time of ped1080p.webm goes from 20.7sec to 11.3sec.
2013-10-02 21:03:15 -04:00
Ronald S. Bultje
848826f527
Native VP9 decoder.
...
Authors: Ronald S. Bultje <rsbultje gmail com>,
Clement Boesch <u pkh me>
2013-10-02 21:03:11 -04:00
Carl Eugen Hoyos
b5f219c904
Print pix_fmt name on h264 context reinitialisation.
2013-10-03 01:42:23 +02:00
Reimar Döffinger
af6e232ccf
VC1 VDPAU: Mark missing reference frames as such.
...
Currently the code passes some nonsense values as
references instead, causing corruption with NVidia's
and assertion failures with Mesa's implementation.
For non-corrupted input this mostly happens in
interlaced bitstreams, e.g.
http://samples.mplayerhq.hu/V-codecs/WMV9/interlaced/480i30__codec_WVC1__mode_2__framerate_29.970__type_2__preproc_17.wmv .
The != VDP_INVALID handle assert does not trigger
(and probably is quite nonsense) because the frames
are initialized to 0.
Signed-off-by: Reimar Döffinger <Reimar.Doeffinger@gmx.de>
2013-10-02 20:51:14 +02:00
Michael Niedermayer
95666b2298
avcodec/imgconvert/get_color_type: fix type for PAL8
...
Fixes Ticket3008
Fate changes as PAL8 gets used instead of BGR8
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-10-02 19:59:10 +02:00
Paul B Mahol
2490996f38
avcodec: use designated initializers for bitstream filters
...
Signed-off-by: Paul B Mahol <onemda@gmail.com>
2013-10-02 17:20:29 +00:00
Anton Khirnov
451606f7ce
lavc: mark deprecated AVCodec.max_lowres for removal on next bump
2013-10-02 16:41:08 +02:00
Maxim Poliakovski
d49f3fa579
atrac3: Generalize gain compensation code
...
Move it to the ATRAC common code, so it can be reused
in the umpcoming ATRAC3+ decoder.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-10-02 10:44:02 +02:00
Maxim Poliakovski
4fa2484067
atrac3/decode_gain_control: cosmetics
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-10-02 10:42:12 +02:00
Maxim Poliakovski
4978be2bc6
atrac3: rename num_gain_data to num_points
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-10-02 10:37:38 +02:00
Maxim Poliakovski
dc80e250fc
atrac3: Rename GainInfo to AtracGainInfo
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-10-02 10:37:05 +02:00
Maxim Poliakovski
746cb9bc53
atrac: limit line length to 80 chars
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-10-02 10:21:35 +02:00
Maxim Poliakovski
3d80ab015f
atrac: Move doxygen comments to the header
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-10-02 10:21:14 +02:00
Maxim Poliakovski
cc2330fe3a
atrac: Update copyright info and file description.
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-10-02 10:19:22 +02:00
Maxim Poliakovski
852241561d
atrac: Add missing av_cold.
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-10-02 10:17:50 +02:00
Michael Niedermayer
286beebdc3
avcodec/wmalosslessdec: check block_align
...
Code copied from wmaprodec
Fixes null pointer dereference
Fixes Ticket3002
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-10-02 01:24:19 +02:00
Michael Niedermayer
795eaf8d69
avcodec/fraps: increase vlc nb_bits
...
This should fix decoding the file in:
http://ffmpeg.gusari.org/viewtopic.php?f=16&t=1078
No i dont have the file so i cant test
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-10-01 20:37:14 +02:00
Michael Niedermayer
54197c7aae
skip_bits: dont call UPDATE_CACHE
...
UPDATE_CACHE isnt needed and can cause segfaults
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-09-30 14:34:12 +02:00
Michael Niedermayer
bbe50a8001
Merge commit 'ff07ec143ebd3833fd5a3f4b6c00474ac523a31f'
...
* commit 'ff07ec143ebd3833fd5a3f4b6c00474ac523a31f':
pcx: Return an error on broken palette if err_detect is set to 'explode'
Conflicts:
libavcodec/pcx.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-09-30 01:54:59 +02:00
Michael Niedermayer
c955bac7d5
Merge commit 'd1d99e3befea5d411ac3aae72dbdecce94f8b547'
...
* commit 'd1d99e3befea5d411ac3aae72dbdecce94f8b547':
pcx: Check the packet size before assuming it fits a palette
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-09-30 01:49:21 +02:00
Michael Niedermayer
1eead87766
Merge commit '7ba0cedbfeff5671b264d1d7e90777057b5714c6'
...
* commit '7ba0cedbfeff5671b264d1d7e90777057b5714c6':
rpza: Fix a buffer size check
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-09-30 01:42:33 +02:00
Michael Niedermayer
1ad36551ec
Merge commit 'aa0dd52434768da64f1f3d8ae92bcf980c1adffc'
...
* commit 'aa0dd52434768da64f1f3d8ae92bcf980c1adffc':
xxan: Disallow odd width
See: 77693c541a
See: 8ad9b48c9b
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-09-30 01:41:17 +02:00
Michael Niedermayer
7d7fb61e0d
Merge commit 'fc739b3eefa0b58d64e7661621da94a94dbc8a82'
...
* commit 'fc739b3eefa0b58d64e7661621da94a94dbc8a82':
xan: Only read within the data that actually was initialized
Conflicts:
libavcodec/xan.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-09-30 01:21:30 +02:00
Michael Niedermayer
b6dfb82913
Merge commit '30db94dc399f6e4ef8905049d9b740556f0fce47'
...
* commit '30db94dc399f6e4ef8905049d9b740556f0fce47':
xan: Use bytestream2 to limit reading to within the buffer
Conflicts:
libavcodec/xan.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-09-30 01:12:15 +02:00
Michael Niedermayer
a612bb3099
Merge commit '9fb0de86b49e9fb0709a8ad1e1875e35da841887'
...
* commit '9fb0de86b49e9fb0709a8ad1e1875e35da841887':
pcx: Consume the whole packet if giving up due to missing palette
Conflicts:
libavcodec/pcx.c
See: b4e516e30e
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-09-30 01:00:50 +02:00
Michael Niedermayer
9834874f8c
Merge commit 'a81cad8f86d1feb7e4bfae29e43f3e994935a5c7'
...
* commit 'a81cad8f86d1feb7e4bfae29e43f3e994935a5c7':
pngdec: Stop trying to decode once inflate returns Z_STREAM_END
Conflicts:
libavcodec/pngdec.c
See: 65bf9a44d7
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-09-30 00:40:17 +02:00
Michael Niedermayer
9e58d46edf
Merge commit '59480abce7e4238e22b3a4a904a9fe6abf4e4188'
...
* commit '59480abce7e4238e22b3a4a904a9fe6abf4e4188':
alac: Do bounds checking of lpc_order read from the bitstream
See: fd4f4923cc
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-09-29 23:17:45 +02:00
Michael Niedermayer
4be0c6ed20
avcodec/tiff_common: fix bprint max sizes
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-09-29 21:28:22 +02:00
Martin Storsjö
ff07ec143e
pcx: Return an error on broken palette if err_detect is set to 'explode'
...
Signed-off-by: Martin Storsjö <martin@martin.st>
2013-09-29 21:05:16 +03:00
Martin Storsjö
d1d99e3bef
pcx: Check the packet size before assuming it fits a palette
...
This fixes reads out of bounds.
Reported-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
CC: libav-stable@libav.org
Signed-off-by: Martin Storsjö <martin@martin.st>
2013-09-29 20:03:12 +03:00
Martin Storsjö
7ba0cedbfe
rpza: Fix a buffer size check
...
We read 2 bytes for 15 out of 16 pixels, therefore we need to
have at least 30 bytes, not 16.
Reported-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
CC: libav-stable@libav.org
Signed-off-by: Martin Storsjö <martin@martin.st>
2013-09-29 20:02:42 +03:00
Martin Storsjö
aa0dd52434
xxan: Disallow odd width
...
Decoded data is always written in pairs within this decoder.
This fixes writes out of bounds.
Reported-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
CC: libav-stable@libav.org
Signed-off-by: Martin Storsjö <martin@martin.st>
2013-09-29 20:02:32 +03:00
Martin Storsjö
fc739b3eef
xan: Only read within the data that actually was initialized
...
Reported-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
CC: libav-stable@libav.org
Signed-off-by: Martin Storsjö <martin@martin.st>
2013-09-29 20:02:19 +03:00
Martin Storsjö
30db94dc39
xan: Use bytestream2 to limit reading to within the buffer
...
Reported-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
CC: libav-stable@libav.org
Signed-off-by: Martin Storsjö <martin@martin.st>
2013-09-29 20:01:50 +03:00
Martin Storsjö
9fb0de86b4
pcx: Consume the whole packet if giving up due to missing palette
...
Previously, we returned 0, meaning successful decoding but 0
bytes consumed, leading to an infinite loop.
Reported-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
CC: libav-stable@libav.org
Signed-off-by: Martin Storsjö <martin@martin.st>
2013-09-29 20:01:29 +03:00
Martin Storsjö
a81cad8f86
pngdec: Stop trying to decode once inflate returns Z_STREAM_END
...
If the input buffer contains more data after the deflate stream,
the loop previously left running infinitely, with inflate returning
Z_STREAM_END.
Reported-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
CC: libav-stable@libav.org
Signed-off-by: Martin Storsjö <martin@martin.st>
2013-09-29 20:01:03 +03:00
Martin Storsjö
59480abce7
alac: Do bounds checking of lpc_order read from the bitstream
...
In lpc_prediction(), we write up to array element 'lpc_order' in
an array allocated to hold 'max_samples_per_frame' elements.
Reported-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
CC: libav-stable@libav.org
Signed-off-by: Martin Storsjö <martin@martin.st>
2013-09-29 19:57:10 +03:00
Michael Niedermayer
e40c96513e
avcodec/exif: print bytes and undefined types as scalar lists
...
This prevents odd characters from ending in the fate test
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-09-29 12:19:47 +02:00
Michael Niedermayer
7859e89ff0
avcodec/tiff_common: add ff_tadd_bytes_metadata()
...
The le argument is passed so the function has the same prototype as the
other similar functions. It is otherwise unused
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-09-29 12:19:47 +02:00
Ronald S. Bultje
face578d56
Rewrite emu_edge functions to have separate src/dst_stride arguments.
...
This allows supporting files for which the image stride is smaller than
the max. block size + number of subpel mc taps, e.g. a 64x64 VP9 file
or a 16x16 VP8 file with -fflags +emu_edge.
2013-09-28 20:28:08 -04:00
Ronald S. Bultje
f574b4da56
vp8: use 2 registers for dst_stride and src_stride in neon bilin filter.
2013-09-28 20:25:29 -04:00
Michael Niedermayer
2b834a0605
avcodec/huffman: Allow specifying nb_bits to ff_huff_build_tree()
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-09-28 20:33:56 +02:00
Michael Bradshaw
f46a3e3d6e
libopenjpeg: fix encoding of odd sized subsampled images
...
Signed-off-by: Michael Bradshaw <mjbshaw@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-09-28 15:04:48 +02:00
Ronald S. Bultje
c341f734e5
Convert multiplier for MV from int to ptrdiff_t.
...
This prevents emulated_edge_mc from not undoing mvy*stride-related
integer overflows.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-09-28 11:28:09 +02:00
Michael Niedermayer
3e0c78bac6
avcodec/imc: Check flcoeffs5
...
Fixes infinite loop
Fixes Ticket2996
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-09-27 23:13:29 +02:00
Michael Niedermayer
f7bea731d9
avcodec/mlpdec: Fail if the input is too small
...
This fixes a infinite loop
Fixes Ticket2986
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-09-27 20:12:37 +02:00
Michael Niedermayer
b654aa6beb
Merge commit '7e52080cb18332cb1da9fe133498750b6b4b0fb3'
...
* commit '7e52080cb18332cb1da9fe133498750b6b4b0fb3':
pcm: support 24-bit/32-bit little-endian planar
Conflicts:
doc/general.texi
libavcodec/Makefile
libavcodec/allcodecs.c
libavcodec/avcodec.h
libavcodec/pcm.c
libavcodec/version.h
libavformat/nut.c
See: 467dfd5dfa
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-09-27 13:05:05 +02:00
Paul B Mahol
7e52080cb1
pcm: support 24-bit/32-bit little-endian planar
...
Used by LXF.
Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
2013-09-27 01:33:45 +02:00
Michael Niedermayer
f31011e9ab
avcodec/parser: reset indexes on realloc failure
...
Fixes Ticket2982
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-09-26 21:03:48 +02:00
Michael Niedermayer
851a6e2f1a
avcodec/wmalosslessdec: Fix return code for invalid buffer sizes
...
Fixes infinite loop
Fixes Ticket2979
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-09-25 21:50:27 +02:00
Paul B Mahol
f5498ef38d
avcodec/flicvideo: fix infinite loops
...
Fixes #2995 .
Reported-by: Piotr Bandurski <ami_stuff@o2.pl>
Signed-off-by: Paul B Mahol <onemda@gmail.com>
2013-09-25 19:45:49 +00:00
Michael Niedermayer
c99d27287d
avcodec/wmaprodec: check that there are input bits left in decode_subframe_length()
...
Fixes infinite loop
Fixes Ticket2987
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-09-25 20:10:24 +02:00
Michael Niedermayer
45f0623ae3
avcodec/lagarith: check scaled probabilities
...
Prevents infinite loop
Fixes Ticket2988
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-09-25 18:26:13 +02:00
Kostya Shishkov
4370f65be8
g2meet: Respect cursor_stride properly everywhere
...
This fixes a regression with rgb cursors since b1e46988
.
Signed-off-by: Martin Storsjö <martin@martin.st>
2013-09-25 17:42:01 +03:00
Michael Niedermayer
ab6fbe8206
avcodec/cabac: remove h264_lps_state
...
The only use case of it was the selftest code, and there the slightly more
complex indexing that is needed after its removial doesnt matter.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-09-25 16:30:25 +02:00
Michael Niedermayer
c3c6999ea1
Merge remote-tracking branch 'qatar/master'
...
* qatar/master:
lavc doxy: document that avcodec_flush_buffers() invalidates decoded frames
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-09-25 11:02:32 +02:00
Michael Niedermayer
4a89868c5f
Merge commit 'cab8c5f8e140c96ba3725ab709d823abfd1e31a5'
...
* commit 'cab8c5f8e140c96ba3725ab709d823abfd1e31a5':
h264: do not reinitialize the global cabac tables at each slice header
See: 1e2e2c8095
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-09-25 10:25:17 +02:00
Michael Niedermayer
b0b66269f4
Merge commit 'e880418660c80e2f12a123e131975cdb6b12cd13'
...
* commit 'e880418660c80e2f12a123e131975cdb6b12cd13':
cabac: remove write-only h264_mps_state[]
Conflicts:
libavcodec/cabac.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-09-25 10:02:09 +02:00
Michael Niedermayer
65bf9a44d7
avcodec/pngdec: check for stream end in png_decode_idat()
...
Fix infinite loop
Fix Ticket2978
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-09-25 02:17:36 +02:00
Michael Niedermayer
bb4b041df3
avcodec/mpegvideo_enc: check qmin/qmax
...
Fixes Ticket2990
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-09-25 00:44:17 +02:00
Michael Niedermayer
c88ac1e023
avcodec/g2meet: fix regression with rgb cursors
...
Fixes Ticket2972
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-09-25 00:25:23 +02:00
Anton Khirnov
5f4b1b1cbd
lavc doxy: document that avcodec_flush_buffers() invalidates decoded frames
2013-09-24 17:34:00 +02:00
Michael Niedermayer
dcc7686ae7
avcodec/mpegvideo: drop emu edge check from chroma_4mv_motion_lowres()
...
This is in line with the other functions
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-09-24 17:15:24 +02:00
Anton Khirnov
cab8c5f8e1
h264: do not reinitialize the global cabac tables at each slice header
2013-09-24 17:13:52 +02:00
Anton Khirnov
e880418660
cabac: remove write-only h264_mps_state[]
2013-09-24 17:13:17 +02:00
Michael Niedermayer
1fb0d96114
Merge commit 'a454dec19aa6666b555deec431bc42eda391d7b6'
...
* commit 'a454dec19aa6666b555deec431bc42eda391d7b6':
pixdesc: fix NV20* descriptors
h264_sei: check SEI size
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-09-24 15:51:08 +02:00
Michael Niedermayer
d195e6e410
Merge commit '71cabb521ac397db3903011d2de7afd3e0fc7ab6'
...
* commit '71cabb521ac397db3903011d2de7afd3e0fc7ab6':
h264: do not discard NAL_SEI when skipping frames
Conflicts:
libavcodec/h264.c
See: 7d75fb381b
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-09-24 15:38:34 +02:00
Michael Niedermayer
af2bb83dff
Merge commit 'edaba18021e4793116f0f266e65077578a5e742e'
...
* commit 'edaba18021e4793116f0f266e65077578a5e742e':
h264: log extradata skip only for non-ignored NALs
Conflicts:
libavcodec/h264.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-09-24 15:30:21 +02:00
Michael Niedermayer
9c2e31c3b3
Merge commit '26179964ff3fa1173e6f512c5735ba8223e2395d'
...
* commit '26179964ff3fa1173e6f512c5735ba8223e2395d':
h264_sei: log unknown sei messages
Conflicts:
libavcodec/h264_sei.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-09-24 15:03:32 +02:00
Michael Niedermayer
0ebc372856
Merge commit '5f24fe82e5fcf227abb5ebf62aa9bc246fda8c0d'
...
* commit '5f24fe82e5fcf227abb5ebf62aa9bc246fda8c0d':
mpegvideo: Initialize chroma_*_shift and codec_tag even if the size is 0
Conflicts:
libavcodec/mpegvideo.c
The chroma_*_shift and codec_tag code was not under a size!=0 check in ffmpeg
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-09-24 14:55:14 +02:00
Kieran Kunhya
58894ab3f9
lavc: add support for interleaved chroma formats to libx264.
...
Interleaved chroma is x264's native format
Signed-off-by: Anton Khirnov <anton@khirnov.net>
2013-09-24 14:15:04 +02:00
Rainer Hochecker
71cabb521a
h264: do not discard NAL_SEI when skipping frames
...
Setting AVDISCARD_NONREF (e.g. after flushing) resulted in 100% dropped frames.
Signed-off-by: Anton Khirnov <anton@khirnov.net>
2013-09-24 13:24:29 +02:00
Michael Niedermayer
84df6d6a85
h264_sei: check SEI size
...
Signed-off-by: Anton Khirnov <anton@khirnov.net>
2013-09-24 13:24:29 +02:00
Vittorio Giovara
edaba18021
h264: log extradata skip only for non-ignored NALs
...
Signed-off-by: Anton Khirnov <anton@khirnov.net>
2013-09-24 13:24:28 +02:00
Vittorio Giovara
26179964ff
h264_sei: log unknown sei messages
...
Signed-off-by: Anton Khirnov <anton@khirnov.net>
2013-09-24 13:24:28 +02:00
Martin Storsjö
5f24fe82e5
mpegvideo: Initialize chroma_*_shift and codec_tag even if the size is 0
...
This fixes breakage in a few fate tests on certain setups
(that for some reason didn't break on OS X) after the previous
commit (8812a8057
). Currently, some video streams are initialized
in ff_MPV_common_init with width/height set at 0 and only changed
to a proper video size with ff_MPV_common_frame_size_change later.
The breakage was diagnosed by Anton Khirnov.
Signed-off-by: Martin Storsjö <martin@martin.st>
2013-09-24 14:02:23 +03:00
Michael Niedermayer
17513f4fb3
Merge remote-tracking branch 'qatar/master'
...
* qatar/master:
h263dec: Remove a hack that can cause infinite loops
Conflicts:
libavcodec/h263dec.c
See: d2981b8ef1
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-09-24 10:59:22 +02:00
Michael Niedermayer
15d4965239
avcodec/mjpegenc: dont store DQT for LJPEG
...
This may improve compatibility of lgpegs generated by libavcodec
also encoded ljpegs become slightly smaller
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-09-24 01:21:03 +02:00
Martin Storsjö
8812a8057f
h263dec: Remove a hack that can cause infinite loops
...
The actual usefulness of the hack is not known, and it does cause
infinite loops with some broken input files.
CC: libav-stable@libav.org
Signed-off-by: Martin Storsjö <martin@martin.st>
2013-09-23 23:14:49 +03:00
Ronald S. Bultje
34b429d5ba
vp8: fix PPC assembly and bilinear C code to work if src_stride != dst_stride.
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-09-23 15:23:53 +02:00
Michael Niedermayer
356031348c
avcodec/vc1dec: fix propagating error codes from various functions
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-09-23 14:57:30 +02:00
Michael Niedermayer
a51f3b53fe
avcodec/vc1dec: Fix return code on malloc() failure from ff_vc1_decode_init_alloc_tables()
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-09-23 14:54:57 +02:00
Michael Niedermayer
50138a9235
Merge commit '23d6ba2c44540eb39c6880e4cbd527d297d264a9'
...
* commit '23d6ba2c44540eb39c6880e4cbd527d297d264a9':
vc1dec: Check the error handling flags on slice/field header decode errors
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-09-23 14:34:36 +02:00
Michael Niedermayer
c74fa39b93
Merge commit 'bb7bf175951475235ee7d0504198c4a30cf5d5dd'
...
* commit 'bb7bf175951475235ee7d0504198c4a30cf5d5dd':
vc1dec: Don't decode slices when the latest slice header failed to decode
Conflicts:
libavcodec/vc1dec.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-09-23 14:03:53 +02:00
Michael Niedermayer
79fbd7a5c1
Merge commit '5e25fdbfe01635cfc650ac4adc27d434b2df0d64'
...
* commit '5e25fdbfe01635cfc650ac4adc27d434b2df0d64':
vc1dec: Make sure last_picture is initialized in vc1_decode_skip_blocks
See: 09de0ffeab
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-09-23 13:57:15 +02:00
Michael Niedermayer
8b85d9bfb6
Merge commit 'b772b0e28eba6abf76d86ee8c6e459a86642db5a'
...
* commit 'b772b0e28eba6abf76d86ee8c6e459a86642db5a':
vc1dec: Undo mpegvideo initialization if unable to allocate tables
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-09-23 13:44:37 +02:00
Michael Niedermayer
eed40b2957
Merge commit 'ede508443e4bf57dc1e019fac81bf6244b88fbd3'
...
* commit 'ede508443e4bf57dc1e019fac81bf6244b88fbd3':
vc1dec: Fix leaks in ff_vc1_decode_init_alloc_tables on errors
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-09-23 13:29:58 +02:00
Michael Niedermayer
621845fecc
Merge commit '91be1103fd1f79d381edf268c32f4166b6c3b6d8'
...
* commit '91be1103fd1f79d381edf268c32f4166b6c3b6d8':
wnv1: Make sure the input packet is large enough
Conflicts:
libavcodec/wnv1.c
See: f23a2418fb
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-09-23 13:20:42 +02:00
Michael Bradshaw
3cfd4df8e7
libopenjpeg: init and close properly; don't config during encode
...
Signed-off-by: Michael Bradshaw <mjbshaw@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-09-23 02:35:50 +02:00
Paul B Mahol
e494f44c05
avcodec/escape124: fix infinite loop
...
Remove can_safely_read() as its not really needed with
checked bitstream reader.
Fixes #2984 .
Reported-by: Piotr Bandurski <ami_stuff@o2.pl>
Signed-off-by: Paul B Mahol <onemda@gmail.com>
2013-09-23 00:19:05 +00:00
Michael Niedermayer
b5b762b714
avcodec/avcodec.h: skip_alpha should not be accessed directly (would cause ABI issues)
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-09-22 20:57:34 +02:00
Martin Storsjö
23d6ba2c44
vc1dec: Check the error handling flags on slice/field header decode errors
...
Signed-off-by: Martin Storsjö <martin@martin.st>
2013-09-22 21:02:52 +03:00
Michael Niedermayer
bb7bf17595
vc1dec: Don't decode slices when the latest slice header failed to decode
...
Reported-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
CC: libav-stable@libav.org
Signed-off-by: Martin Storsjö <martin@martin.st>
2013-09-22 21:02:52 +03:00
Martin Storsjö
5e25fdbfe0
vc1dec: Make sure last_picture is initialized in vc1_decode_skip_blocks
...
Reported-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
CC: libav-stable@libav.org
Signed-off-by: Martin Storsjö <martin@martin.st>
2013-09-22 21:02:52 +03:00
Martin Storsjö
b772b0e28e
vc1dec: Undo mpegvideo initialization if unable to allocate tables
...
Previously, s->context_initialized was left set to 1
if ff_vc1_decode_init_alloc_tables failed, skipping the
initialization completely on the next decode call.
Reported-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
CC: libav-stable@libav.org
Signed-off-by: Martin Storsjö <martin@martin.st>
2013-09-22 21:02:47 +03:00
Kieran Kunhya
283fb76d3d
lavc: Add support for interleaved chroma formats to libx264. Interleaved chroma is x264's native format
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-09-22 19:55:57 +02:00
Paul B Mahol
b00fb157ba
avcodec/sgirledec: fix infinite loop in decode_sgirle8()
...
Fixes #2985 .
Reported-by: Piotr Bandurski <ami_stuff@o2.pl>
Signed-off-by: Paul B Mahol <onemda@gmail.com>
2013-09-22 17:30:51 +00:00
Reimar Döffinger
547c2f002a
Make decoding alpha optional for some codecs.
...
For codecs where decoding of a whole plane can simply
be skipped, we should offer applications to not decode
alpha for better performance (ca. 30% less CPU usage
and 40% reduced memory bandwidth).
It also means applications do not need to implement support
(even if it is rather simple) for YUVA formats in order to be
able to play these files.
Signed-off-by: Reimar Döffinger <Reimar.Doeffinger@gmx.de>
2013-09-22 16:20:54 +02:00
Reimar Döffinger
2aa8e33d7d
Fix nonsense MPEG-4 hwaccel code.
...
Issues with the code:
1) The skip_bits_long breaks packed B-frames since we skip
of the packed frame, even for VDPAU.
2) Calling ff_h263_find_resync_marker_reverse is nonsense for MPEG-4,
and for H.263 the only code using this (vaapi_mpeg4) explicitly reverts
this change!
3) mb_x/mb_y are always 0 when vaapi_mpeg4_decode_slice, so doing
computations with them is just obfuscation
4) due to not updating mb_y the code would always go into the error
resilience case, causing nonsense error messages and maybe further
issues.
While tested to fix the data provided to the decoder in case of
VDPAU so it is the same as for the non-hwaccel code, the VA-API code
was not tested to still work, and adding regression testing even
as a quick hack is much more complicated for it.
Signed-off-by: Reimar Döffinger <Reimar.Doeffinger@gmx.de>
2013-09-22 16:08:35 +02:00
Martin Storsjö
ede508443e
vc1dec: Fix leaks in ff_vc1_decode_init_alloc_tables on errors
...
Reported-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
CC: libav-stable@libav.org
Signed-off-by: Martin Storsjö <martin@martin.st>
2013-09-22 16:10:22 +03:00
Martin Storsjö
91be1103fd
wnv1: Make sure the input packet is large enough
...
Reported-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
CC: libav-stable@libav.org
Signed-off-by: Martin Storsjö <martin@martin.st>
2013-09-22 16:10:21 +03:00
Michael Niedermayer
e07ac727c1
avcodec/g2meet: Fix framebuf size
...
Currently the code can in some cases draw tiles that hang outside the
allocated buffer. This patch increases the buffer size to avoid out
of array accesses. An alternative would be to fail if such tiles are
encountered.
I do not know if any valid files use such hanging tiles.
Fixes Ticket2971
Found-by: ami_stuff
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-09-22 00:04:39 +02:00
Michael Niedermayer
a072acb108
avcodec: fix duplicate includes
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-09-21 16:59:13 +02:00
Hendrik Leppkes
1c4fa2aaf2
avcodec/fraps: use BT.709 colorspace for YUV Fraps versions
...
Based both on comparison to the reference decoder, and comments from
the fraps developers upon inquiry how to handle the yuv fraps variants.
2013-09-21 13:09:13 +00:00
Michael Niedermayer
8ad2465987
Merge remote-tracking branch 'cehoyos/master'
...
* cehoyos/master:
Allow encoding YUVJ422P and YUVJ444P with libx264.
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-09-21 14:07:41 +02:00
Carl Eugen Hoyos
79209f5d6c
Allow encoding YUVJ422P and YUVJ444P with libx264.
...
Reviewed-by: Reimar
2013-09-21 09:54:06 +02:00
Reimar Döffinger
f76b633a94
mpeg4dec: Ensure data is not clobbered too early.
...
Avoid overwriting the bitstream buffer data before we
have ended processing the frame.
This is necessary to fix hwaccels which might try to use
the buffer during the end_frame call.
I am not sure but it is possible this could even trigger
a use-after-free if the av_fast_malloc allocated a new buffer.
This would require that decode_slice did not wind the bitstream
forward all the way to the end, which does not currently happen in
normal streams.
Signed-off-by: Reimar Döffinger <Reimar.Doeffinger@gmx.de>
2013-09-21 09:40:28 +02:00
Reimar Döffinger
29f244e08e
dvbsubdec: Check for invalid clut selector.
...
Fail decoding if strict compliance is requested.
Signed-off-by: Reimar Döffinger <Reimar.Doeffinger@gmx.de>
2013-09-21 09:51:10 +02:00
JULIAN GARDNER
97ff584af4
Apply clut changes only to one table.
...
The specification does not allow multiple bits to be set,
but some encoders do it anyway.
Applying it only to the first seems to give better results.
Signed-off-by: Reimar Döffinger <Reimar.Doeffinger@gmx.de>
2013-09-21 09:51:09 +02:00
Michael Niedermayer
8c320b3c08
Merge commit 'a9d50bb578ec04c085a25f1e023f75e0e4499d5e'
...
* commit 'a9d50bb578ec04c085a25f1e023f75e0e4499d5e':
dcadec: Validate the lfe parameter
Conflicts:
libavcodec/dcadec.c
See: 3b2cd83a82
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-09-20 15:37:55 +02:00
Michael Niedermayer
9bb86faca7
Merge commit '3185a80259ce1f8f8111073dbd14a69a396e03a3'
...
* commit '3185a80259ce1f8f8111073dbd14a69a396e03a3':
fraps: Make the input buffer size checks more strict
Conflicts:
libavcodec/fraps.c
The added checks are mostly to handle duplicate frames, which
we discard, thus there are also no P frames for example.
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-09-20 14:21:34 +02:00
Vittorio Giovara
1cad7171dd
h264: remove an unused static constant
...
Signed-off-by: Martin Storsjö <martin@martin.st>
2013-09-20 14:40:10 +03:00
Michael Niedermayer
c092af3008
Merge commit '601c2015bc16f0b281160292a6a760cbbbb0eacb'
...
* commit '601c2015bc16f0b281160292a6a760cbbbb0eacb':
svq3: Avoid a division by zero
Conflicts:
libavcodec/svq3.c
See: 4fa706a4a6
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-09-20 13:29:39 +02:00
Michael Niedermayer
61a8eaf711
Merge commit '7a5a55722749a3ab77941914707277b147322cbe'
...
* commit '7a5a55722749a3ab77941914707277b147322cbe':
qpeg: Add checks for running out of rows in qpeg_decode_inter
Conflicts:
libavcodec/qpeg.c
See: 4299dfa5de
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-09-20 13:20:06 +02:00
Martin Storsjö
a9d50bb578
dcadec: Validate the lfe parameter
...
Reported-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
CC: libav-stable@libav.org
Signed-off-by: Martin Storsjö <martin@martin.st>
2013-09-20 14:14:45 +03:00
Michael Niedermayer
3f4cf77abd
Merge commit 'e9d61de96c113ee0ef8082833c7e682df0e23eec'
...
* commit 'e9d61de96c113ee0ef8082833c7e682df0e23eec':
mpegaudiodec: Validate that the number of channels fits at the given offset
Conflicts:
libavcodec/mpegaudiodec.c
See: 51fcf276f8
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-09-20 13:06:12 +02:00
Michael Niedermayer
13b353a7cb
avcodec/asvdec: dont fail without extradata
...
extradata is not mandatory to decode asv
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-09-20 12:51:22 +02:00
Michael Niedermayer
1e9a850df9
Merge commit 'f50803354c6acb4575379d7c54ca48ec5d36dd61'
...
* commit 'f50803354c6acb4575379d7c54ca48ec5d36dd61':
asvdec: Verify the amount of extradata
See: 605f2b6b00
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-09-20 12:49:15 +02:00
Michael Niedermayer
9c8aeacf82
avutil: add av_get_colorspace_name()
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-09-19 22:14:13 +02:00
Martin Storsjö
3185a80259
fraps: Make the input buffer size checks more strict
...
Reported-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
CC: libav-stable@libav.org
Signed-off-by: Martin Storsjö <martin@martin.st>
2013-09-19 22:45:59 +03:00
Martin Storsjö
601c2015bc
svq3: Avoid a division by zero
...
If the height is zero, the decompression will probably end up
failing due to not fitting into the allocated buffer later
anyway, so this doesn't need any more elaborate check.
Reported-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
CC: libav-stable@libav.org
Signed-off-by: Martin Storsjö <martin@martin.st>
2013-09-19 22:45:16 +03:00
Martin Storsjö
7a5a557227
qpeg: Add checks for running out of rows in qpeg_decode_inter
...
Reported-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
CC: libav-stable@libav.org
Signed-off-by: Martin Storsjö <martin@martin.st>
2013-09-19 22:44:39 +03:00
Martin Storsjö
e9d61de96c
mpegaudiodec: Validate that the number of channels fits at the given offset
...
This is similar to the fix in 35cbc98b
.
Reported-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
CC: libav-stable@libav.org
Signed-off-by: Martin Storsjö <martin@martin.st>
2013-09-19 22:44:18 +03:00
Martin Storsjö
f50803354c
asvdec: Verify the amount of extradata
...
The init function reads one byte of extradata.
Reported-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
CC: libav-stable@libav.org
Signed-off-by: Martin Storsjö <martin@martin.st>
2013-09-19 22:43:55 +03:00
Michael Niedermayer
93648ee47b
Merge remote-tracking branch 'qatar/master'
...
* qatar/master:
rv34: Fix a memory leak on errors
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-09-19 13:49:17 +02:00
Michael Niedermayer
b4c88a4c4c
Merge commit '5372cda67109848d22146289e401669266217e80'
...
* commit '5372cda67109848d22146289e401669266217e80':
rv10: Validate the dimensions set from the container
This check could be replaced by a width==0||height==0
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-09-19 13:28:32 +02:00