Michael Niedermayer
2c16bf2de0
vorbisdec: Check bark_map_size.
...
This fixes potential divisions by zero and out of array accesses.
Reported-by: Dale Curtis <dalecurtis@chromium.org>
Found-by: inferno@chromium.org
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-01-11 00:58:40 +01:00
Ronald Bultje
ec86ba5731
vp3: Fix double free in vp3_decode_end()
...
Signed-off-by: Dale Curtis <dalecurtis@chromium.org>
Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
2013-01-10 20:05:42 +01:00
Carl Eugen Hoyos
b563afe6fa
Do not allow arbitrary packet size in aac decoder.
...
Fixes a crash with a file containing a 400MB packet reported in bug 420.
2013-01-10 13:03:15 +01:00
Michael Niedermayer
65b8527993
Merge commit 'f7bf72a4a1146a7583577c9bdc066767e1ba3c6a'
...
* commit 'f7bf72a4a1146a7583577c9bdc066767e1ba3c6a':
idcinvideo: correctly set AVFrame defaults
yadif: Port inline assembly to yasm
au: remove unnecessary casts
au: return AVERROR codes instead of -1
Conflicts:
libavcodec/idcinvideo.c
libavfilter/x86/yadif_template.c
libavformat/au.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-01-10 12:27:16 +01:00
Carl Eugen Hoyos
f023003ce6
Fix compilation with --disable-everything.
2013-01-10 10:04:46 +01:00
Michael Niedermayer
6471f63da2
wmalosslessdec: make arrays indexed by ch large enough for maximum number of channels
...
Fixes out of array accesses
Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-01-10 04:57:50 +01:00
Michael Niedermayer
7cb46b5191
targa: use checked bytestream read
...
Fix out of array read
Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-01-10 04:57:50 +01:00
Michael Niedermayer
2b12d1ffd8
qdm2: fix out of stack array read.
...
The read value is not used when its outside the array.
Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-01-10 04:57:50 +01:00
Justin Ruggles
f7bf72a4a1
idcinvideo: correctly set AVFrame defaults
2013-01-09 14:49:06 -05:00
Michael Niedermayer
4765f63538
Merge remote-tracking branch 'qatar/master'
...
* qatar/master:
xan: Convert to bytestream2
oggenc: add a page_duration option and deprecate the pagesize option
x86: lavr: add SSE2/AVX dither_int_to_float()
Conflicts:
libavcodec/xan.c
libavformat/oggenc.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-01-09 12:30:14 +01:00
Alexandra Khirnova
d744801f1a
xan: Convert to bytestream2
...
Signed-off-by: Diego Biurrun <diego@biurrun.de>
2013-01-09 09:59:55 +01:00
Michael Niedermayer
57bdd67646
dirac: fix inverted check
...
Regression since: ea6da80
Fixes Ticket2123
I cannot reproduce any regressions by flipping the wrong condition
to how it should have been.
Thanks-to: ubitux
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-01-09 01:08:39 +01:00
Michael Niedermayer
86159703f5
ff_find_pix_fmt: return NONE for the "not found" case.
...
Found-by: durandal_1707
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-01-08 14:32:19 +01:00
Michael Niedermayer
4c80184cf5
mjpegdec: allow 2 components in ljpeg_decode_yuv_scan()
...
Fixes assertion failure
Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-01-08 02:54:21 +01:00
Michael Niedermayer
3b57bb478f
svq1dec: check that the reference frame matches in size before using it.
...
Fixes out of array reads
Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-01-08 00:28:35 +01:00
Clément Bœsch
dbf0a90572
lavc: fix forgotten "que" reference.
...
This should have been part of 491ca0e8
.
2013-01-07 22:07:50 +01:00
Michael Niedermayer
f65daf577a
rv10: always check direct mode interpolation times.
...
Fixes Division by 0
Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-01-07 21:35:52 +01:00
Michael Niedermayer
7fb87bc5f2
mpeg12enc: check dimension validity
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-01-07 15:47:21 +01:00
Michael Niedermayer
bcc4ef1a41
mpeg12enc: Correctly mask dimensions
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-01-07 15:47:06 +01:00
Michael Niedermayer
878e5bd6f5
mpeg12: Support decoding dimensions that are a multiple of 4096
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-01-07 15:31:00 +01:00
Paul B Mahol
2a89081cad
Add EVRCA and SMV codec id
...
Demuxing files should be possible even if there are
no decoding support in lavc (yet).
Signed-off-by: Paul B Mahol <onemda@gmail.com>
2013-01-07 11:43:20 +00:00
Paul B Mahol
2516023695
012v: remove double ; and return correct error code if ff_get_buffer() fails
...
Signed-off-by: Paul B Mahol <onemda@gmail.com>
2013-01-07 10:48:02 +00:00
Michael Niedermayer
c526a01c91
Merge commit '4f50646697606df39317b93c2a427603b77636ee'
...
* commit '4f50646697606df39317b93c2a427603b77636ee':
x86: sbrdsp: Implement SSE qmf_post_shuffle
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-01-07 01:51:10 +01:00
Michael Niedermayer
8429320313
Merge commit '44a0036d10579ed91e48df24859e54b08a582742'
...
* commit '44a0036d10579ed91e48df24859e54b08a582742':
x86: sbrdsp: Implement SSE sum64x5
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-01-07 01:40:05 +01:00
Michael Niedermayer
ea93ccf079
Merge commit '5b4dfbffc258f90a7d2540d21209ac23afcf7cd0'
...
* commit '5b4dfbffc258f90a7d2540d21209ac23afcf7cd0':
x86: ABS1: port to cpuflags
v210x: cosmetics, reformat
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-01-07 01:35:18 +01:00
Michael Niedermayer
55d8cac254
Merge commit '6689474b91049411b5b7986616d1c66b701ae11f'
...
* commit '6689474b91049411b5b7986616d1c66b701ae11f':
v210x: return meaningful error codes.
r210dec: return meaningful error codes.
vb: cosmetics, reformat
Conflicts:
libavcodec/vb.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-01-07 01:30:23 +01:00
Michael Niedermayer
501db2f32b
Merge commit '9dbbda235d93d628777b986e502213f1ed390973'
...
* commit '9dbbda235d93d628777b986e502213f1ed390973':
vb: return meaningful error codes.
ptx: return meaningful error codes.
tiff: return meaningful error codes.
vqavideo: return meaningful error codes.
mss2: return meaningful error codes.
v210dec: return meaningful error codes
indeo2: cosmetics, reformat
Conflicts:
libavcodec/indeo2.c
libavcodec/tiff.c
libavcodec/v210dec.c
libavcodec/vb.c
libavcodec/vqavideo.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-01-07 01:24:32 +01:00
Michael Niedermayer
4b20d307b3
Merge commit '7b1fbd4729a52dd7c02622dbe7bb81a6a7ed12f8'
...
* commit '7b1fbd4729a52dd7c02622dbe7bb81a6a7ed12f8':
indeo2: check decoding errors.
indeo2: return meaningful error codes
rl2: cosmetics, reformat
Conflicts:
libavcodec/rl2.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-01-07 01:11:14 +01:00
Michael Niedermayer
d30660306c
Merge commit '3c6e5a840c45fd3b832e86881602a72e47d46f19'
...
* commit '3c6e5a840c45fd3b832e86881602a72e47d46f19':
rl2: use fixed-width integer types where appropriate
rl2: return meaningful error codes.
cljr: return a meaningful error code.
fraps: cosmetics, reformat
Conflicts:
libavcodec/fraps.c
libavcodec/rl2.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-01-07 01:01:13 +01:00
Michael Niedermayer
07f22d0b49
Merge commit '57d11e5e28bfe0bc445ad78fc033aafa73068bb4'
...
* commit '57d11e5e28bfe0bc445ad78fc033aafa73068bb4':
fraps: return meaningful error codes.
kgv1dec: return meaningful error codes.
kmvc: return meaningful error codes.
wnv1: return meaningful error codes.
dpx: return meaningful error codes.
truemotion1: return meaningful error codes
pnm: return meaningful error codes.
Conflicts:
libavcodec/dpx.c
libavcodec/fraps.c
libavcodec/kmvc.c
libavcodec/pnm.c
libavcodec/pnmdec.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-01-07 00:41:06 +01:00
Michael Niedermayer
7b018e5c8d
Merge commit '84f2847de394ac447f53306bd4dd73e1af6ea5e4'
...
* commit '84f2847de394ac447f53306bd4dd73e1af6ea5e4':
xl: return a meaningful error code.
xan: return a meaningful error code.
xxan: return meaningful error codes.
zmbv: return more meaningful error codes.
yop: use a meaningful error code.
c93: return meaningful error codes.
bmv: return meaningful error codes.
bmp: return meaningful error codes.
bink: operate with pointers to AVFrames instead of whole structs.
bink: return meaningful error codes.
bfi: return meaningful error codes.
bethsoftvideo: return meaningful error codes.
Conflicts:
libavcodec/c93.c
libavcodec/xl.c
libavcodec/xxan.c
libavcodec/yop.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-01-06 23:59:35 +01:00
Michael Niedermayer
6190446745
Merge commit 'e83c1e2d0bedb5d4fa9ab351126b2ecc552f1355'
...
* commit 'e83c1e2d0bedb5d4fa9ab351126b2ecc552f1355':
avs: return meaningful error codes.
aura: return meaningful error codes.
asvdec: return meaningful error codes.
ansi: return a meaningful error code
anm: return meaningful error codes
aasc: return meaningful error codes.
8bps: return meaningful error codes.
4xm: operate with pointers to AVFrames instead of whole structs.
4xm: eliminate a pointless indirection
Conflicts:
libavcodec/4xm.c
libavcodec/aasc.c
libavcodec/anm.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-01-06 23:48:48 +01:00
Michael Niedermayer
a2aeaff40f
Merge commit 'aa15afb7ce850e2ac688efdef189df5da817a646'
...
* commit 'aa15afb7ce850e2ac688efdef189df5da817a646':
4xm: simplify code with FFSWAP
4xm: return meaningful error codes
Conflicts:
libavcodec/4xm.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-01-06 23:41:19 +01:00
Carl Eugen Hoyos
9ff92cf195
012v decoder.
...
The decoder also supports a12v, but removes the transparency layer
since no samples with actual transparency are available for testing.
2013-01-06 17:59:27 +01:00
Diego Biurrun
a0c5917f86
Drop Snow codec
...
Snow is a toy codec with no real-world use and horrible code.
2013-01-06 16:30:02 +01:00
Michael Niedermayer
3db02b83e7
dnxhd: Add avpriv_dnxhd_get_frame_size()
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-01-06 13:58:46 +01:00
Christophe Gisquet
4f50646697
x86: sbrdsp: Implement SSE qmf_post_shuffle
...
255 to 174 cycles on Arrandale / Win64. Unrolling yields no gain.
Signed-off-by: Diego Biurrun <diego@biurrun.de>
2013-01-06 13:57:01 +01:00
Christophe Gisquet
44a0036d10
x86: sbrdsp: Implement SSE sum64x5
...
698 to 174 cycles on Arrandale. Unrolling is a 6 cycles gain.
Signed-off-by: Diego Biurrun <diego@biurrun.de>
2013-01-06 13:57:01 +01:00
Diego Biurrun
5b4dfbffc2
x86: ABS1: port to cpuflags
2013-01-06 13:57:01 +01:00
Michael Niedermayer
11e1466b43
cos_tablegen: fix the lack on M_PI
...
We dont include mathematics.h as the headers get configured by config.h
for the target not the host.
Reviewed-by: Clément Bœsch <ubitux@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-01-06 13:56:55 +01:00
Thilo Borgmann
bfde6e5c02
alsdec: Introduce failsafe switch to keep ALSSpecificConfig consistent to the input.
...
Reveiwed-by: Paul B Mahol <onemda@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-01-06 13:55:58 +01:00
Thilo Borgmann
95f81159de
alsdec: Consistently use a period at the end of error messages.
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-01-06 13:52:53 +01:00
Anton Khirnov
6689474b91
v210x: return meaningful error codes.
2013-01-06 13:31:40 +01:00
Anton Khirnov
9dbbda235d
vb: return meaningful error codes.
2013-01-06 13:31:40 +01:00
Anton Khirnov
7b1fbd4729
indeo2: check decoding errors.
2013-01-06 13:31:40 +01:00
Anton Khirnov
3c6e5a840c
rl2: use fixed-width integer types where appropriate
2013-01-06 13:31:40 +01:00
Anton Khirnov
57d11e5e28
fraps: return meaningful error codes.
2013-01-06 13:31:40 +01:00
Anton Khirnov
84f2847de3
xl: return a meaningful error code.
2013-01-06 13:31:40 +01:00
Anton Khirnov
de16f08e48
v210x: cosmetics, reformat
2013-01-06 13:31:40 +01:00
Anton Khirnov
39039f2405
r210dec: return meaningful error codes.
2013-01-06 13:31:40 +01:00
Anton Khirnov
a0ffcee1ee
ptx: return meaningful error codes.
2013-01-06 13:31:40 +01:00
Anton Khirnov
6ea2c9a4cf
indeo2: return meaningful error codes
2013-01-06 13:31:40 +01:00
Anton Khirnov
126abaaaae
rl2: return meaningful error codes.
2013-01-06 13:31:40 +01:00
Anton Khirnov
405486c28b
kgv1dec: return meaningful error codes.
2013-01-06 13:31:40 +01:00
Anton Khirnov
d47dabbac2
xan: return a meaningful error code.
2013-01-06 13:31:40 +01:00
Anton Khirnov
4324a3ce75
vb: cosmetics, reformat
2013-01-06 13:31:40 +01:00
Anton Khirnov
b2a7b81b9c
tiff: return meaningful error codes.
2013-01-06 13:31:40 +01:00
Anton Khirnov
6781b5315e
rl2: cosmetics, reformat
2013-01-06 13:31:40 +01:00
Anton Khirnov
7c8fceef6c
cljr: return a meaningful error code.
2013-01-06 13:31:40 +01:00
Anton Khirnov
e1a7061d63
kmvc: return meaningful error codes.
2013-01-06 13:31:40 +01:00
Anton Khirnov
26a161a166
vqavideo: return meaningful error codes.
2013-01-06 13:31:40 +01:00
Anton Khirnov
80344261aa
fraps: cosmetics, reformat
2013-01-06 13:31:40 +01:00
Anton Khirnov
f3fcb1a7b2
wnv1: return meaningful error codes.
2013-01-06 13:31:40 +01:00
Anton Khirnov
edfe05ddf1
mss2: return meaningful error codes.
2013-01-06 13:31:40 +01:00
Anton Khirnov
0c19b23bd5
dpx: return meaningful error codes.
2013-01-06 13:31:40 +01:00
Anton Khirnov
f0547c9bd0
v210dec: return meaningful error codes
2013-01-06 13:31:40 +01:00
Anton Khirnov
b61e0b99df
truemotion1: return meaningful error codes
2013-01-06 13:31:40 +01:00
Anton Khirnov
c04c64c08e
indeo2: cosmetics, reformat
2013-01-06 13:31:40 +01:00
Anton Khirnov
380242ca50
pnm: return meaningful error codes.
2013-01-06 13:31:40 +01:00
Anton Khirnov
e83c1e2d0b
avs: return meaningful error codes.
2013-01-06 13:31:39 +01:00
Anton Khirnov
aa15afb7ce
4xm: simplify code with FFSWAP
2013-01-06 13:31:39 +01:00
Anton Khirnov
4aebb8d999
xxan: return meaningful error codes.
2013-01-06 13:31:39 +01:00
Anton Khirnov
620faee5d1
aura: return meaningful error codes.
2013-01-06 13:31:39 +01:00
Anton Khirnov
10c26e928a
4xm: return meaningful error codes
2013-01-06 13:31:39 +01:00
Anton Khirnov
aaf208329f
zmbv: return more meaningful error codes.
2013-01-06 13:31:39 +01:00
Anton Khirnov
38de3365ca
asvdec: return meaningful error codes.
2013-01-06 13:31:39 +01:00
Anton Khirnov
01b60883ea
yop: use a meaningful error code.
2013-01-06 13:31:39 +01:00
Anton Khirnov
b3b17f7800
ansi: return a meaningful error code
2013-01-06 13:31:39 +01:00
Anton Khirnov
11c3f2047e
c93: return meaningful error codes.
2013-01-06 13:31:39 +01:00
Anton Khirnov
b622e2b540
anm: return meaningful error codes
2013-01-06 13:31:39 +01:00
Anton Khirnov
2b011a43e9
bmv: return meaningful error codes.
2013-01-06 13:31:39 +01:00
Anton Khirnov
18009e60d2
aasc: return meaningful error codes.
2013-01-06 13:31:39 +01:00
Anton Khirnov
abcc235481
bmp: return meaningful error codes.
2013-01-06 13:31:39 +01:00
Anton Khirnov
313da47aa1
8bps: return meaningful error codes.
2013-01-06 13:31:39 +01:00
Anton Khirnov
6a97ea65b6
bink: operate with pointers to AVFrames instead of whole structs.
...
This is more correct and avoids breaking extended_data.
2013-01-06 13:31:39 +01:00
Anton Khirnov
f7d15d2f42
4xm: operate with pointers to AVFrames instead of whole structs.
...
This is more correct and avoids breaking extended_data.
2013-01-06 13:31:39 +01:00
Anton Khirnov
86d4e75422
bink: return meaningful error codes.
2013-01-06 13:31:39 +01:00
Anton Khirnov
85383d139a
4xm: eliminate a pointless indirection
2013-01-06 13:31:39 +01:00
Anton Khirnov
86e09b9e60
bfi: return meaningful error codes.
2013-01-06 13:31:39 +01:00
Anton Khirnov
fc2a94c15e
bethsoftvideo: return meaningful error codes.
2013-01-06 13:31:39 +01:00
Clément Bœsch
2e7744a6a2
lavc/subviewerdec: fix potential NULL deref.
...
Fixes CID966647
2013-01-06 04:04:22 +01:00
Piotr Bandurski
4784a135b2
tiffdec: Use the correct height field.
...
Fixes Ticket913
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-01-06 01:56:53 +01:00
Michael Niedermayer
f3c9d66baf
libspeexdec: fix terminator check
...
Fixes Ticket2096
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-01-05 18:36:13 +01:00
Paul B Mahol
d4211c4722
alsdec: change channel sorting so it match reference implementation
...
Read channel source instead of channel target for channel sorting.
Signed-off-by: Paul B Mahol <onemda@gmail.com>
2013-01-05 09:36:14 +00:00
Paul B Mahol
ddeb299234
lavc: remove img_get_alpha_info as it not available any more
...
Signed-off-by: Paul B Mahol <onemda@gmail.com>
2013-01-04 20:13:03 +00:00
Paul B Mahol
d885cc41e5
Fix "knwon" typo and add a check in tools/patcheck
...
Signed-off-by: Paul B Mahol <onemda@gmail.com>
2013-01-04 19:24:37 +00:00
Maximilian Seesslen
467c033858
fixed granularity of video quality when encoding with theora codec
...
The floating point version of av_clip has to be used when converting the quality level.
Signed-off-by: Maximilian Seesslen <mes@seesslen.net>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-01-04 18:46:24 +01:00
Michael Niedermayer
c98d3056cf
msrle: fix small palette handling
...
Fixes second file in Ticket1273
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-01-04 17:06:29 +01:00
Michael Niedermayer
e1cf1a9c89
Merge commit 'a0b7e289075dccf223b7f407790d8a86fc5d77e8'
...
* commit 'a0b7e289075dccf223b7f407790d8a86fc5d77e8':
aviobuf: Partial support for reading in read/write contexts
build: Avoid detecting bogus components named 'x'
Conflicts:
libavcodec/allcodecs.c
libavdevice/alldevices.c
libavformat/allformats.c
libavformat/aviobuf.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-01-04 13:01:54 +01:00
Michael Niedermayer
b888cea9cb
ac3dec: split out pointer update loop for saftey
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-01-04 06:20:39 +01:00
Michael Niedermayer
4e0738cec9
mpegaudiodec/mp3on4: fix buffer size.
...
The larger (and really ugly) size is not needed anymore.
Found-by: Justin Ruggles
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-01-04 06:20:19 +01:00
Michael Niedermayer
7b5fdd04de
locodec: flip RGBA
...
Fixes Ticket1222
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-01-04 04:49:16 +01:00
Michael Niedermayer
9e36d9e4ed
pngdec: fix decoding of right column for 2/4bpp
...
Fixes Ticket1146
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-01-03 23:40:22 +01:00
Paul B Mahol
0c8943939e
gifdec: use log level that have more common sense
...
Signed-off-by: Paul B Mahol <onemda@gmail.com>
2013-01-03 19:33:57 +00:00
Clément Bœsch
3048fae63c
build: Avoid detecting bogus components named 'x'
...
The function find_things() in configure is confused by component
registration calls as part of multiline macros defining combined
component registration. Coalesce those macros into one line to
work around the issue.
Signed-off-by: Diego Biurrun <diego@biurrun.de>
Signed-off-by: Martin Storsjö <martin@martin.st>
2013-01-03 15:11:25 +02:00
Michael Niedermayer
1894302a44
Merge remote-tracking branch 'qatar/master'
...
* qatar/master:
cmdutils: update copyright year to 2013
h264: check SPS entries directly to detect pixel format changes
forgotten changelogs for 9_beta2
Conflicts:
Changelog
cmdutils.c
libavcodec/h264.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-01-03 13:22:45 +01:00
Janne Grunau
9ac44ad9d0
h264: check SPS entries directly to detect pixel format changes
...
Comparing AVCodecContext.pix_fmt against the get_pixel_format() return
value has the side effect of calling the get_format() callback on each
slice. Users of the callback will probably handle hardware accelerator
initialization in the callback.
2013-01-03 11:09:00 +01:00
Clément Bœsch
3fa642d60f
subviewer: sanitize packets.
...
The data does not contain timing or trailing line breaks anymore. In
addition to being less idiotic, it is consistent with other codecs and
thus allows more switches between formats and codecs. It also fixes the
issue of the trailing line returns being simple \n instead of CRLF in
the ASS rectangle dialogue (this is the reason of the FATE update).
2013-01-03 07:25:47 +01:00
Michael Niedermayer
52334f5be2
tiff: print error for old style LZW
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-01-03 04:26:57 +01:00
Clément Bœsch
491ca0e89f
Replace references to "que" with the appropriate word.
...
"que" sounds like a slang word to me. This commit renames a few
variables, fix the comments and the logging messages (sometimes along
with small other typo fixes).
2013-01-03 00:21:47 +01:00
Michael Niedermayer
1e28fa21de
rawdec: fix NV12
...
Fixes Ticket646
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-01-02 03:56:57 +01:00
Janne Grunau
e9fd51b0d6
h264: check SPS entries directly to detect pixel format changes
...
Comparing AVCodecContext.pix_fmt against the get_pixel_format() return
value has the side effect of calling the get_format() callback on each
slice. Users of the callback will probably handle hardware accelerator
initialization in the callback.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-01-02 02:28:57 +01:00
Nicolas George
5ed5e90f2a
lavc/dvdsubenc: improve color distance function.
...
Consider the color space as an hypercone with apex alpha=0
and base alpha=1 instead of an hypercube.
Make the encoder consider very transparent colors more similar
even if the hue is very different.
This corresponds roughly to using the alpha as a weight for the
color difference.
Only 4 bits of alpha are used, because this is what dvdsub uses,
and it avoids overflows.
Fix trac ticket #2005 .
2013-01-01 20:07:37 +01:00
Clément Bœsch
7d66bc7920
lavc/movtextdec: keep the min size instead of max to fix overread.
...
Fixes Ticket #2087 .
2013-01-01 16:41:37 +01:00
Michael Niedermayer
f105fe5c22
rawdec: fix decoding of odd dimensioned raw yv12
...
Fix Ticket339 part 2 of 2
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-01-01 00:44:44 +01:00
Michael Niedermayer
6e8df250fd
mpeg12: fix frame_pred_frame_dct handling in field pictures
...
Fixes Ticket254
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2012-12-31 20:55:03 +01:00
Michael Niedermayer
49ec0d8ed2
mpeg12: print invalid cbp value
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2012-12-31 20:55:02 +01:00
Michael Niedermayer
343900a147
mpeg12: print error for invalid skip cases
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2012-12-31 20:55:02 +01:00
Nicolas George
9e28e0035a
lavc/flacenc: improve error return.
...
Use meaningful error codes and add log messages.
2012-12-31 19:11:12 +01:00
Michael Niedermayer
08196c785a
Merge remote-tracking branch 'qatar/master'
...
* qatar/master:
configure: suppress -fPIC in msvc builds
Drop unnecessary 'l' length modifier when printfing double values.
truemotion2: Sanitize tm2_read_header()
Conflicts:
libavcodec/truemotion2.c
libavfilter/src_movie.c
libavutil/opt.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2012-12-31 14:20:01 +01:00
Michael Niedermayer
98275283d5
Merge commit '5e6ee38bd3cef0dd05f1dd7977c71f3479eb6d01'
...
* commit '5e6ee38bd3cef0dd05f1dd7977c71f3479eb6d01':
FATE: add cavs test
cavsdec: export picture type in the output frame
Conflicts:
tests/fate/video.mak
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2012-12-31 13:53:21 +01:00
Michael Niedermayer
ca95d1b32d
Merge commit '7d8482640058d66867602a6f58446c9342d9d146'
...
* commit '7d8482640058d66867602a6f58446c9342d9d146':
cavs: deMpegEncContextize
Note, the bugfixes have all been in FFmpeg previously, this just switches away
from MpegEncContext
Conflicts:
libavcodec/cavs.c
libavcodec/cavsdec.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2012-12-31 13:38:01 +01:00
Michael Niedermayer
6ddda83c3f
Merge commit '64bb3fa6b7f5b2db22b7577585d5861be24eebd8'
...
* commit '64bb3fa6b7f5b2db22b7577585d5861be24eebd8':
cavs: cosmetics, reformat top part
cavsdec: cosmetics, reformat
libavcodec/utils: Add braces to shut up gcc warnings
Conflicts:
libavcodec/cavsdec.c
libavcodec/utils.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2012-12-31 13:14:06 +01:00
Clément Bœsch
87350d6b44
lavc/textdec: fix subviewer1 preproc check.
2012-12-31 13:06:29 +01:00
Diego Biurrun
117f79de2d
truemotion2: Sanitize tm2_read_header()
...
Also give a variable a more sensible name.
2012-12-31 11:20:45 +01:00
Clément Bœsch
72ff8ee158
lavc: correctly set AVSubtitle format for text based subtitles.
2012-12-31 10:08:27 +01:00
Clément Bœsch
e3c25860dc
lavc/utils: reindent in avcodec_decode_subtitle2().
2012-12-31 10:06:32 +01:00
Clément Bœsch
1f265f5205
microdvd: sanitize AVPackets.
...
Current MicroDVD AVPackets contain timing information and trailing line
breaks. The data is now only composed of the markup data. Doing this
consistently between text subtitles decoders allows to use different
codec for various formats. For instance, MicroDVD markup is sometimes
found in some VPlayer files. Also, generally speaking, the subtitles
text decoders have no use of these timings (and they must not use them
since it would break any user timing adjustment).
Technically, this is a major ABI break. In practice, a mismatching
lavf/lavc will now error out for MicroDVD decoding. Supporting both
formats requires unnecessary complex and fragile code.
FATE needs update because line breaks in the ASS file were "\n" (because
that's what is used in the original file). ASS format expect "\r\n" line
breaks; this commit fixes this issue. Also note that this "\r\n"
trailing need to be moved at some point from the decoders to the ASS
muxer.
2012-12-31 00:41:35 +01:00
Clément Bœsch
faa94061dd
Add SubViewer v1 subtitles demuxer and decoder.
2012-12-31 00:01:58 +01:00
Clément Bœsch
7b43402724
Add PJS subtitles demuxer and decoder.
2012-12-30 23:55:28 +01:00
Clément Bœsch
67286fa98b
10l: export ff_bprint_to_extradata between libs using avpriv_ prefix.
...
Both libavformat and libavcodec requires this function.
2012-12-30 22:54:56 +01:00
Clément Bœsch
5c68aae908
Add VPlayer subtitles demuxer and decoder.
...
Note that the linebreaks text codec option (but not the feature) has
been removed; its main goal was to allow demuxers to configure the text
decoder (and not meant to be used by users), but the AVOption are not a
viable solution. This is solved differently in this commit.
2012-12-30 22:46:42 +01:00
Clément Bœsch
5f02844c8d
Add MPL2 subtitles demuxer and decoder.
2012-12-30 22:37:25 +01:00
Clément Bœsch
2d3305e4f4
lavc/avcodec: fix FF_INPUT_/BUFFER_/PADDING_SIZE typo.
2012-12-30 22:22:18 +01:00
Clément Bœsch
36e61e24e7
lavc: add ff_bprint_to_extradata() helper and use it.
...
This commit also makes sure the extradata and subtitle_header are NUL
terminated, without taking into account the trailing '\0' in account in
the size.
At the same time, it should fix 'warning: dereferencing type-punned
pointer will break strict-aliasing rules' warning for compilers who
don't consider uint8_t** and char** compatibles.
2012-12-30 22:19:04 +01:00
Clément Bœsch
e911f4ae72
lavc/srtenc: just like the decoder, mark SRT encoder as deprecated.
2012-12-30 21:39:36 +01:00
Clément Bœsch
1b673cd9ff
lavc/srtenc: do not add trailing line breaks with SubRip.
...
The SRT muxer is reponsible for separating events with two line breaks,
there is no need to add more than necessary. Similarly, other muxers
(such as Matroska) are not supposed to add line breaks at the end of the
payload.
2012-12-30 21:39:36 +01:00
Clément Bœsch
d927d8395d
lavc/srtdec: make some sscanf to work at the end of a line.
...
Fix sscanf calls that can't work at the end of a line unless it ends
with \r\n or \n: the markup line may/should/must not end with these
characters.
2012-12-30 21:39:35 +01:00
Anton Khirnov
fb0cb11f09
cavsdec: export picture type in the output frame
2012-12-30 18:52:26 +01:00
Anton Khirnov
7d84826400
cavs: deMpegEncContextize
...
It does not use any of the mpegvideo infrastructure, just a few fields
from the context.
Fixes a segfault with the emu edge flag, since emu edge buffer is now
allocated as a part of the frame buffer allocation and cavs calls
ff_get_buffer() directly, it does not use mpegvideo buffer management.
Fixes a memleak of the last frame.
2012-12-30 18:48:11 +01:00
Anton Khirnov
64bb3fa6b7
cavs: cosmetics, reformat top part
2012-12-30 18:47:54 +01:00
Anton Khirnov
185c2ef849
cavsdec: cosmetics, reformat
2012-12-30 18:47:30 +01:00
Don Moir
522cb6abf2
gifdec: use transparent instead of background color index
...
Wrong code was commited in 64f4fb75c4
.
2012-12-30 17:21:25 +00:00
Clément Bœsch
613001d75f
Merge back some registering macros in all*.c.
...
This breaks the sed in configure:find_things(). Fixes regression from
c73c87b
. Fixes Ticket2079.
Found-by: jamal
2012-12-30 07:18:21 +01:00
Clément Bœsch
c83002a4f8
lavc/ass_split: check for NULL pointer in ff_ass_split_override_codes().
...
This is consistent with the other ff_ass_split_* functions.
It also fixes a crash when trying to split a dialog with text=NULL
(which seems to happen when the text of the dialog is empty); basically,
this commit fixes crashes when trying to encode an empty text subtitle
dialog (see subrip and mov_text encoders).
Fixes Ticket2048.
2012-12-30 06:57:34 +01:00
Michael Niedermayer
b113d4a83c
aacdec: make dual mono mode selectable through AVOptions too.
...
Based on patch by Akihiro Tsukada
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2012-12-30 05:29:17 +01:00
Michael Niedermayer
644f021ccf
aacdec: simplify dmono
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2012-12-30 05:29:17 +01:00
Michael Niedermayer
6d38661920
aacdec: fix dual mono
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2012-12-30 05:29:17 +01:00
Diego Biurrun
015da965a6
libavcodec/utils: Add braces to shut up gcc warnings
...
libavcodec/utils.c:1050:5: warning: missing braces around initializer [-Wmissing-braces]
libavcodec/utils.c:1314:5: warning: missing braces around initializer [-Wmissing-braces]
2012-12-30 01:52:04 +01:00
Michael Niedermayer
05d81a57f5
motion_est_template: fix warning: "ASSERT_LEVEL" is not defined
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2012-12-29 19:37:20 +01:00
Luca Barbato
d615da60c1
snow: use VideoDSPContext
...
It was left over from the initial conversion.
2012-12-29 18:05:49 +01:00
Michael Niedermayer
83d4a8442c
Merge remote-tracking branch 'qatar/master'
...
* qatar/master:
cosmetics: Prettyprint codec/format/filter registration files
Conflicts:
libavcodec/allcodecs.c
libavdevice/alldevices.c
libavfilter/allfilters.c
libavformat/allformats.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2012-12-29 14:27:38 +01:00
Michael Niedermayer
e0a99d5411
msmpeg4enc: fix possible use of uninitialized warning
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2012-12-29 03:07:45 +01:00
Michael Niedermayer
2fbc8ea08e
hpel_motion_search: move code used for asserts under correct #if
...
This avoids compiler warnings about set but not used variables
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2012-12-29 03:07:45 +01:00
Michael Niedermayer
30872fa09b
ivi_common: Fix use of uninitialized warnings
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2012-12-29 03:07:45 +01:00
Michael Niedermayer
76e65a1b73
avs: silence "may be used uninitialized" warnings
...
We initialize the struct to 0 to also ensure any actual use of
the pointers in it will not lead to security issues.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2012-12-29 03:07:45 +01:00
Michael Niedermayer
07abf13da4
h264: avoid a grayscale related if() in hl_decode_mb()
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2012-12-28 21:01:54 +01:00
Diego Biurrun
c73c87b412
cosmetics: Prettyprint codec/format/filter registration files
2012-12-28 19:18:13 +01:00
Michael Niedermayer
69db85c30c
mjpegdec: Support 16bit DQT
...
Fixes Ticket2072
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2012-12-27 23:18:40 +01:00
Paul B Mahol
10a3fa8f31
build: fix g723_1 decoder dependency
...
g723_1 decoder needs celp_math.o because it calls ff_dot_product().
Signed-off-by: Paul B Mahol <onemda@gmail.com>
2012-12-27 18:23:11 +00:00
Don Moir
64f4fb75c4
gifdec: fix transparent background color
...
Signed-off-by: Paul B Mahol <onemda@gmail.com>
2012-12-27 18:10:25 +00:00
Michael Niedermayer
b61097fe0d
mjpegdec: reset restart_count on progressive scans
...
Fixes Ticket2068
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2012-12-27 17:41:53 +01:00
Michael Niedermayer
011169cd41
mjpegdec: handle the occurance of rstn emulation
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2012-12-26 20:43:56 +01:00
Michael Niedermayer
5ff8ca1f04
mjpegdec: Handle RSTn in progressive jpegs
...
Fixes Ticket2003
Reviewed-by: Alexander Strasser <eclipse7@gmx.net>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2012-12-26 20:43:20 +01:00
Michael Niedermayer
47e7f57a4b
mjpegdec: factor handle_rstn() out
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2012-12-26 20:25:02 +01:00
Michael Niedermayer
39d178806d
Merge remote-tracking branch 'qatar/master'
...
* qatar/master:
mpegvideo: initialize videodsp with correct pixel depth
Conflicts:
libavcodec/mpegvideo.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2012-12-26 15:19:35 +01:00
Michael Niedermayer
075eaf8d6a
vc1dsp: fix the warning fix, make it work with --disable-asm
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2012-12-26 14:24:31 +01:00
Michael Niedermayer
fceeac9847
vc1dsp: fix pointer type warnings
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2012-12-26 03:00:35 +01:00
Michael Niedermayer
67c1acf234
lavc/utils: fix 'warning: missing braces around initializer'
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2012-12-26 01:53:45 +01:00
Michael Niedermayer
169dfe320d
lcldec: fix zlib const pointer warning
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2012-12-26 01:37:38 +01:00
Michael Niedermayer
2ad1eb1907
imgconvert: fix 2 "discards const qualifier from pointer target type"
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2012-12-26 01:36:00 +01:00
Michael Niedermayer
2eab1a178c
imgconvert: dont depend on default return type for get_color_type()
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2012-12-26 01:34:26 +01:00
Michael Niedermayer
4f927542fb
h264_direct: silence several warning: assignment from incompatible pointer type"
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2012-12-26 01:23:19 +01:00
Janne Grunau
1f4ea4e068
mpegvideo: initialize videodsp with correct pixel depth
...
Fixes decoding of 9/10 bit per pixel h264 videos as reported in
https://bugzilla.libav.org/show_bug.cgi?id=404 .
2012-12-26 00:24:21 +01:00
Michael Niedermayer
9cb887ed37
dsputil_mmx: fix pointer type for emulated_edge_mc_func()
...
Found-by: ubitux
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2012-12-25 02:04:31 +01:00
Michael Niedermayer
7681b8e9a9
Merge remote-tracking branch 'qatar/master'
...
* qatar/master:
wnv1: cosmetics, reformat
xan: remove a trivially true if().
ansi: do not depend on get_buffer() initializing the frame.
zerocodec: remove an unused variable.
zmbv: remove some pointless comments and empty lines
Conflicts:
libavcodec/xan.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2012-12-24 16:20:07 +01:00
Michael Niedermayer
9dbedf331e
Merge commit 'c6303f8d70c25dd6c6e6486c78bf99c9924e2b6b'
...
* commit 'c6303f8d70c25dd6c6e6486c78bf99c9924e2b6b':
yop: simplify/sanitize the decoding loop
c93: set palette_has_changed.
bmp: cosmetics, reformat
hlsenc: Don't duplicate a string constant
Conflicts:
libavcodec/bmp.c
tests/ref/fate/yop
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2012-12-24 15:48:02 +01:00
Michael Niedermayer
ba8e909c82
Merge commit '3193b13aa1e271f6d2dd68de67d448c08aef3c00'
...
* commit '3193b13aa1e271f6d2dd68de67d448c08aef3c00':
hlsenc: Allocate enough space for the pattern string
lavc: Correct the description of pkt_dts
avfilter: Compile FIFO filters unconditionally
Conflicts:
libavcodec/avcodec.h
libavfilter/Makefile
libavfilter/allfilters.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2012-12-24 15:29:15 +01:00
Michael Niedermayer
d69238e991
Merge commit 'f3298f12997eb4b7ad203766f768f92e3dd72a2a'
...
* commit 'f3298f12997eb4b7ad203766f768f92e3dd72a2a':
Return proper error code after av_log_ask_for_sample()
configure: cosmetics: Separate hwaccel dependencies from decoders/encoders
oggdec: check memory allocation
Conflicts:
configure
libavcodec/pictordec.c
libavformat/anm.c
libavformat/oggdec.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2012-12-24 15:09:58 +01:00
Anton Khirnov
0a9132b84c
wnv1: cosmetics, reformat
2012-12-24 09:18:19 +01:00
Anton Khirnov
51648da4dc
xan: remove a trivially true if().
...
This function used to be shared with the xxan decoder, but that is not
true anymore.
2012-12-24 09:17:57 +01:00
Anton Khirnov
99e36ddd3e
ansi: do not depend on get_buffer() initializing the frame.
...
The background changes from 128 (used by the default/cmdutils
get_buffer()) to 0. This looks more correct.
2012-12-24 09:17:45 +01:00
Anton Khirnov
261f0b14ed
zerocodec: remove an unused variable.
2012-12-24 09:17:40 +01:00
Anton Khirnov
8adfacff5c
zmbv: remove some pointless comments and empty lines
2012-12-24 09:17:34 +01:00
Anton Khirnov
c6303f8d70
yop: simplify/sanitize the decoding loop
...
Do not overwrite linesize set by get_buffer().
The last frame in the FATE test is not decoded anymore, since the file
is cut and a part of it is missing.
2012-12-24 09:16:51 +01:00
Anton Khirnov
f6e395e132
c93: set palette_has_changed.
2012-12-24 09:16:11 +01:00
Anton Khirnov
3eab600752
bmp: cosmetics, reformat
2012-12-24 09:15:30 +01:00
Michael Niedermayer
98b7a50a21
tiffdec: Fix runend handling
...
Fixes Ticket1999
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2012-12-24 04:35:12 +01:00
Clément Bœsch
98dc25672f
lavc/pthread: do not re-define _GNU_SOURCE if already defined.
...
This fixes the following warning with GCC:
libavcodec/pthread.c:35:0: warning: _GNU_SOURCE redefined [enabled by default]
<command-line>::0: note: this is the location of the previous definition
The reason of the presence of this flag is:
% pkg-config --cflags sdl
-D_GNU_SOURCE=1 -D_REENTRANT -I/usr/include/SDL
2012-12-24 00:54:06 +01:00
Paul B Mahol
98fed176cf
alsdec: improve warning message when invalid channel position is found
...
Signed-off-by: Paul B Mahol <onemda@gmail.com>
2012-12-23 21:17:44 +00:00
Martin Storsjö
0940580adb
lavc: Correct the description of pkt_dts
...
The description as updated in 6e5c44b0f made it sound like it is
handled exactly like the pts, which it is not. Clarify that it
is the packet that triggered returning the frame instead of just
the last avpacket (in case of frame threading, it won't be the
dts of the last packet).
Signed-off-by: Martin Storsjö <martin@martin.st>
2012-12-23 20:52:21 +02:00
Michael Niedermayer
3e15775333
x86/ac3dsp_init: try to workaround ICC failure.
...
The asm code is not valid for older compilers as it uses too many
operands, ICC on x86_32 seems affected by this.
This patch disables the affected code for ICC on x86_32 and should
make it compileable again.
A better fix would be to use fewer operands or to change this code
to yasm, later is being worked on AFAIK so this is a temporary
solution.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2012-12-23 19:27:19 +01:00
Diego Biurrun
f3298f1299
Return proper error code after av_log_ask_for_sample()
2012-12-23 18:56:56 +01:00
Michael Niedermayer
8e09e183fc
Merge remote-tracking branch 'qatar/master'
...
* qatar/master:
8bps: cosmetics
aasc: cosmetics, reformat
ansi: remove an extra return
asvdec: cosmetics, reformat
aura: cosmetics, reformat
Conflicts:
libavcodec/aasc.c
libavcodec/asvdec.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2012-12-23 15:03:15 +01:00
Michael Niedermayer
def18e5470
Merge commit 'b047c68783aa4042b322af7af043b643d5daf09c'
...
* commit 'b047c68783aa4042b322af7af043b643d5daf09c':
4xm: don't rely on get_buffer() initializing the frame.
huffyuv: split encoder and decoder into separate files.
lavc: make pkt_{p,d}ts doxy less confusing
Conflicts:
libavcodec/Makefile
libavcodec/huffyuv.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2012-12-23 14:53:21 +01:00
Michael Niedermayer
2f9903f662
Merge commit '418693bdc5edad72b0d055f741931612d797eb05'
...
* commit '418693bdc5edad72b0d055f741931612d797eb05':
lavc: rewrite and extend AVFrame doxy
opt: avoid segfault in av_opt_next() if the class does not have an option list
ttadec: fix last frame handling when seeking
alacdec: do not be too strict about the extradata size
Conflicts:
libavcodec/alac.c
libavcodec/avcodec.h
libavcodec/tta.c
libavutil/opt.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2012-12-23 13:32:40 +01:00
Anton Khirnov
b6d7d4efae
8bps: cosmetics
...
Remove some pointless comments and empty lines.
2012-12-23 11:17:53 +01:00
Anton Khirnov
b047c68783
4xm: don't rely on get_buffer() initializing the frame.
2012-12-23 11:17:53 +01:00
Anton Khirnov
c64cf2a37b
aasc: cosmetics, reformat
2012-12-23 11:17:53 +01:00
Anton Khirnov
808b2227d7
ansi: remove an extra return
2012-12-23 11:17:53 +01:00
Anton Khirnov
c3a76c3dec
asvdec: cosmetics, reformat
2012-12-23 11:17:53 +01:00
Anton Khirnov
bdfa24514e
aura: cosmetics, reformat
2012-12-23 11:17:53 +01:00
Anton Khirnov
2ca5ca2957
huffyuv: split encoder and decoder into separate files.
2012-12-23 11:17:49 +01:00
Anton Khirnov
6e5c44b043
lavc: make pkt_{p,d}ts doxy less confusing
2012-12-23 10:35:32 +01:00
Anton Khirnov
418693bdc5
lavc: rewrite and extend AVFrame doxy
2012-12-23 10:35:27 +01:00
Michael Niedermayer
ca9eb9305a
mpegvideo_enc: fix edge emulation of dimension%16 != 0 for YUV != 420
...
Fixes Ticket2041
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2012-12-23 04:20:18 +01:00
Justin Ruggles
5778299c7e
ttadec: fix last frame handling when seeking
...
Using a frame count, as is done currently, does not work at all with
seeking. Instead, when the number of samples in the final frame has
been decoded, we check if only the 32-bit CRC is remaining. If so, we
assume that it is the final frame.
There is no longer a need to keep total_frames in TTAContext.
2012-12-22 14:45:35 -05:00
Johannes Nixdorf
e749b5dd98
configure: consider using /usr/include/openjpeg-1.5 when searching for openjpeg
...
Beginning with version 1.5.1 openjpeg defaults to install its headers to
/usr/include/openjpeg-${major}.${minor} instead of /usr/include without
providing a compatibility symlink making the old test fail.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2012-12-22 18:55:39 +01:00
Michael Niedermayer
985aa0be82
h264: Detect POC inconsistencies and try to handle them reasonably
...
Improves the file from Ticket2050
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2012-12-22 18:35:43 +01:00
Justin Ruggles
68a04b0cce
alacdec: do not be too strict about the extradata size
...
Sometimes the extradata has duplicate atoms, but that shouldn't prevent
decoding. Just ensure that it is at least 36 bytes as a sanity check.
CC: libav-stable@libav.org
2012-12-22 12:18:41 -05:00
Michael Niedermayer
98256622a6
Merge remote-tracking branch 'qatar/master'
...
* qatar/master:
flac: only set channel layout if not previously set or on channel count change
prepare 9_beta3 release
Conflicts:
RELEASE
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2012-12-22 13:25:53 +01:00
Justin Ruggles
aef5150719
flac: only set channel layout if not previously set or on channel count change
...
Fixes Bug 402
2012-12-22 01:35:28 -05:00
Michael Niedermayer
5ffb5e7a2d
4xm: check the correct stream, fix fate
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2012-12-22 03:41:55 +01:00
Paul B Mahol
44fe118e0a
lavc/4xm: use bytestream2_get_bytes_left
...
Also replace relevant bytestream2 functions with unchecked variants due
code that already checks for overreads.
Signed-off-by: Paul B Mahol <onemda@gmail.com>
2012-12-22 00:27:29 +00:00
Michael Niedermayer
e16bac7b33
videodsp: Fix project name
...
These are all part of splited out dsp utils from FFmpeg
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2012-12-22 00:58:08 +01:00
Michael Niedermayer
90eaa989f1
x86/videodsp_init: Add back lost author attribution
...
Code originates from:
910b9f30
libavcodec/dsputil.c (David Conrad 2010-05-27 04:39:27 +0000 334) void ff_emulated_edge_mc(uint8_t *buf, const uint8_t *src, int linesize, int block_w, int block_h,
93a21abd
libavcodec/mpegvideo.c (Michael Niedermayer 2002-07-14 18:37:35 +0000 335) int src_x, int src_y, int w, int h){
93a21abd
libavcodec/mpegvideo.c (Michael Niedermayer 2002-07-14 18:37:35 +0000 336) int x, y;
93a21abd
libavcodec/mpegvideo.c (Michael Niedermayer 2002-07-14 18:37:35 +0000 337) int start_y, start_x, end_y, end_x;
b5a093b3
libavcodec/mpegvideo.c (Michael Niedermayer 2002-07-25 20:22:36 +0000 338)
93a21abd
libavcodec/mpegvideo.c (Michael Niedermayer 2002-07-14 18:37:35 +0000 339) if(src_y>= h){
93a21abd
libavcodec/mpegvideo.c (Michael Niedermayer 2002-07-14 18:37:35 +0000 340) src+= (h-1-src_y)*linesize;
93a21abd
libavcodec/mpegvideo.c (Michael Niedermayer 2002-07-14 18:37:35 +0000 341) src_y=h-1;
225f9c44
libavcodec/mpegvideo.c (Michael Niedermayer 2002-07-15 00:25:53 +0000 342) }else if(src_y<=-block_h){
225f9c44
libavcodec/mpegvideo.c (Michael Niedermayer 2002-07-15 00:25:53 +0000 343) src+= (1-block_h-src_y)*linesize;
225f9c44
libavcodec/mpegvideo.c (Michael Niedermayer 2002-07-15 00:25:53 +0000 344) src_y=1-block_h;
93a21abd
libavcodec/mpegvideo.c (Michael Niedermayer 2002-07-14 18:37:35 +0000 345) }
93a21abd
libavcodec/mpegvideo.c (Michael Niedermayer 2002-07-14 18:37:35 +0000 346) if(src_x>= w){
93a21abd
libavcodec/mpegvideo.c (Michael Niedermayer 2002-07-14 18:37:35 +0000 347) src+= (w-1-src_x);
93a21abd
libavcodec/mpegvideo.c (Michael Niedermayer 2002-07-14 18:37:35 +0000 348) src_x=w-1;
225f9c44
libavcodec/mpegvideo.c (Michael Niedermayer 2002-07-15 00:25:53 +0000 349) }else if(src_x<=-block_w){
225f9c44
libavcodec/mpegvideo.c (Michael Niedermayer 2002-07-15 00:25:53 +0000 350) src+= (1-block_w-src_x);
225f9c44
libavcodec/mpegvideo.c (Michael Niedermayer 2002-07-15 00:25:53 +0000 351) src_x=1-block_w;
93a21abd
libavcodec/mpegvideo.c (Michael Niedermayer 2002-07-14 18:37:35 +0000 352) }
93a21abd
libavcodec/mpegvideo.c (Michael Niedermayer 2002-07-14 18:37:35 +0000 353)
b8a78f41
libavcodec/mpegvideo.c (Michael Niedermayer 2002-11-10 11:46:59 +0000 354) start_y= FFMAX(0, -src_y);
b8a78f41
libavcodec/mpegvideo.c (Michael Niedermayer 2002-11-10 11:46:59 +0000 355) start_x= FFMAX(0, -src_x);
b8a78f41
libavcodec/mpegvideo.c (Michael Niedermayer 2002-11-10 11:46:59 +0000 356) end_y= FFMIN(block_h, h-src_y);
b8a78f41
libavcodec/mpegvideo.c (Michael Niedermayer 2002-11-10 11:46:59 +0000 357) end_x= FFMIN(block_w, w-src_x);
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2012-12-22 00:58:08 +01:00
Michael Niedermayer
28286a63d0
videodsp_template.c: fix year
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2012-12-22 00:58:08 +01:00
Michael Niedermayer
2f436b1fce
lavc: Warn in case the set bitrate is very low
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2012-12-21 22:50:57 +01:00
Carl Eugen Hoyos
a3a22c2178
Revert "Always write all colours for animated gif files, including transparent ones."
...
It breaks some opaque samples.
This reverts commit d4fdaafdb7
.
2012-12-21 18:18:39 +01:00
Michael Niedermayer
d27edc038a
Merge commit '511cf612ac979f536fd65e14603a87ca5ad435f3'
...
* commit '511cf612ac979f536fd65e14603a87ca5ad435f3':
miscellaneous typo fixes
Conflicts:
libavcodec/4xm.c
libavcodec/lagarith.c
libavcodec/parser.c
libavcodec/ratecontrol.c
libavcodec/shorten.c
libavcodec/vda_h264.c
libavformat/dvenc.c
libavformat/wtv.c
tools/patcheck
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2012-12-21 17:32:52 +01:00
Michael Niedermayer
a41bf09d9c
Merge commit '6906b19346ae8a330bfaa1c16ce535be10789723'
...
* commit '6906b19346ae8a330bfaa1c16ce535be10789723':
lavc: add missing files for arm
lavc: introduce VideoDSPContext
Conflicts:
configure
libavcodec/arm/dsputil_init_armv5te.c
libavcodec/dsputil.c
libavcodec/dsputil.h
libavcodec/dsputil_template.c
libavcodec/h264.c
libavcodec/mpegvideo.h
libavcodec/mpegvideo_enc.c
libavcodec/x86/dsputil_mmx.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2012-12-21 17:18:43 +01:00
Paul B Mahol
fb3f28ee28
alsdec: cosmetics after previous commit
...
Signed-off-by: Paul B Mahol <onemda@gmail.com>
2012-12-21 14:14:57 +00:00
Paul B Mahol
ae27b70b9d
alsdec: channel sorting
...
Signed-off-by: Paul B Mahol <onemda@gmail.com>
2012-12-21 14:11:12 +00:00
Paul B Mahol
cfa530034f
gifdec: remove dead store
...
Signed-off-by: Paul B Mahol <onemda@gmail.com>
2012-12-21 00:33:14 +00:00
Diego Biurrun
511cf612ac
miscellaneous typo fixes
2012-12-21 00:18:34 +01:00
Carl Eugen Hoyos
d4fdaafdb7
Always write all colours for animated gif files, including transparent ones.
...
This fixes the colour of the transparent background (as seen with ffplay),
and makes the background of some non-keyframes transparent that was
incorrectly shown as opaque for some samples.
2012-12-20 23:05:42 +01:00
Paul B Mahol
9321e93502
gifdec: fix invalid write in gif_copy_img_rect
...
Signed-off-by: Paul B Mahol <onemda@gmail.com>
2012-12-20 17:56:52 +00:00
Paul B Mahol
c004de0b1c
gifdec: fix invalid write in giff_fill_rect
...
Signed-off-by: Paul B Mahol <onemda@gmail.com>
2012-12-20 17:46:05 +00:00
Piotr Bandurski
17714adbf8
tiffdec: support LZW compression with inverted FillOrder
2012-12-20 15:38:52 +00:00
Luca Barbato
6906b19346
lavc: add missing files for arm
...
Across the many retouches those did not make the main commit.
2012-12-20 14:07:23 +01:00
Ronald S. Bultje
8c53d39e7f
lavc: introduce VideoDSPContext
...
Move some functions from dsputil. The idea is that videodsp contains
functions that are useful for a large and varied set of video decoders.
Currently, it contains emulated_edge_mc() and prefetch().
Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
2012-12-20 13:40:45 +01:00
Michael Niedermayer
a9275b4f69
h264: Fix code to also handle pix format changes.
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2012-12-20 12:56:47 +01:00
Michael Niedermayer
41135b7f64
Merge remote-tracking branch 'qatar/master'
...
* qatar/master:
lavr: add option for dithering during sample format conversion to s16
mpeg12: do not decode extradata more than once.
Conflicts:
libavcodec/mpeg12.c
libavcodec/mpeg12.h
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2012-12-20 12:18:28 +01:00
Michael Niedermayer
40ea343866
Merge commit 'c661cb6672af5ebcb900ec8766b24761bd2ab011'
...
* commit 'c661cb6672af5ebcb900ec8766b24761bd2ab011':
cmdutils: pass number of groups to split_commandline().
mov: handle h263 and flv1 for codec_tag 'H','2','6','3'
h264: fix sps parsing for SVC and CAVLC 4:4:4 Intra profiles
Conflicts:
libavcodec/h264_ps.c
libavformat/isom.c
libavformat/mov.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2012-12-20 12:06:15 +01:00
Michael Niedermayer
8525fa7c2c
h264: remove unused variable
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2012-12-20 04:22:21 +01:00
Michael Niedermayer
73db0bf1b0
mpegvideo: increase scratchpad sizes
...
These where reduced in f1d8763a02
and this change can cause out of array accesses.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2012-12-20 03:58:13 +01:00
Michael Niedermayer
7e90053822
Merge remote-tracking branch 'qatar/master'
...
* qatar/master:
mpegvideo: increase edge_emu_buffer size for VC1
lavc: merge latest x86inc.asm fixes with x264
Conflicts:
libavcodec/mpegvideo.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2012-12-20 02:51:35 +01:00
Michael Niedermayer
1667152a9c
Merge commit 'acb571c89a065d943163c11efb46de35774f1909'
...
* commit 'acb571c89a065d943163c11efb46de35774f1909':
avcodec: bump minor for adaptive h264 frame-mt
avconv: pass the actually selected decoder to filter_codec_opts().
Conflicts:
Changelog
ffmpeg_opt.c
libavcodec/version.h
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2012-12-20 02:44:22 +01:00
Anton Khirnov
5823686261
mpeg12: do not decode extradata more than once.
...
Fixes CVE-2012-2803.
CC: libav-stable@libav.org
2012-12-19 22:32:54 +01:00
Michael Niedermayer
ca4dd3810e
h264: use must_reinit to simplify code
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2012-12-19 21:46:11 +01:00
Michael Niedermayer
af0fafcb6f
h264: decode_update_thread_context() copy parameter sets before using them
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2012-12-19 21:46:11 +01:00
Michael Niedermayer
e33811bd26
h264: remove reschange blocking
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2012-12-19 21:46:11 +01:00
Michael Niedermayer
c2dfb1e37c
h264: support frame size changes with multi threading
...
Based on code by Janne Grunau
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2012-12-19 21:46:11 +01:00
Michael Niedermayer
8ea4a5533f
h264: move h264_set_parameter_from_sps() call up
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2012-12-19 21:46:11 +01:00
Michael Niedermayer
afc03268b4
h264: move list_count and current_slice reset to flush_change()
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2012-12-19 21:46:11 +01:00
Michael Niedermayer
971c469a0d
h264: split flush_change() out of flush_dpb()
...
Based on a patch by Janne Grunau
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2012-12-19 21:46:11 +01:00
Michael Niedermayer
25a0af51da
h264: factor get_pixel_format() out
...
Based on patch by Janne Grunau
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2012-12-19 21:46:11 +01:00
Michael Niedermayer
642a655f7d
Merge commit 'f1d8763a02b5fce9a7d9789e049d74a45b15e1e8'
...
* commit 'f1d8763a02b5fce9a7d9789e049d74a45b15e1e8':
mpegvideo: allocate scratch buffers after linesize is known
Conflicts:
libavcodec/mpegvideo.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2012-12-19 15:44:59 +01:00
Michael Niedermayer
e84194f060
Merge commit 'ed2d7d5868a4a5d914f1e5488d63ea696a3b2937'
...
* commit 'ed2d7d5868a4a5d914f1e5488d63ea696a3b2937':
ff_h264_direct_ref_list_init: fix B slice check.
h264: increase dist_scale_factor for up to 32 references
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2012-12-19 14:39:30 +01:00
Michael Niedermayer
af804dbe9e
Merge commit '523c7bd23c781aa0f3a85044896f5e18e8b52534'
...
* commit '523c7bd23c781aa0f3a85044896f5e18e8b52534':
misc typo, style and wording fixes
Conflicts:
libavcodec/options_table.h
libavutil/pixfmt.h
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2012-12-19 14:28:58 +01:00
Victor Lopez
1c8bf3bfed
h264: fix sps parsing for SVC and CAVLC 4:4:4 Intra profiles
...
Fixes bug 396.
CC: libav-stable@libav.org
2012-12-19 13:40:48 +01:00
Carl Eugen Hoyos
ec4a084581
Show underscores in av_get_codec_tag_string().
2012-12-19 10:01:07 +01:00
Janne Grunau
45635885e4
mpegvideo: increase edge_emu_buffer size for VC1
...
The VC1 decoder uses edge_emu_buffer simultaneously for luma and chroma
and needs more space. That was not a problem before f1d8763a02
since the size for edge_emu_buffer was always calculated with 2 byte per
pixel since the linesize was not known.
Fixes occasionally fate errors in vc1_sa10143.
2012-12-19 07:57:22 +01:00
Paul B Mahol
dea9da5f16
qcelpdata: correct start bit for cbgain[0] in qcelp_rate_octave_bitmap[]
...
Signed-off-by: Paul B Mahol <onemda@gmail.com>
2012-12-19 01:24:56 +00:00
Janne Grunau
acb571c89a
avcodec: bump minor for adaptive h264 frame-mt
...
Also adds forgotten Changelog entry.
2012-12-18 20:26:53 +01:00
Janne Grunau
9e696d2e5f
h264: support frame parameter changes during frame-mt
...
Fixes CVE-2012-2782.
2012-12-18 19:55:10 +01:00
Janne Grunau
f1d8763a02
mpegvideo: allocate scratch buffers after linesize is known
...
Since we can't know which stride a custom get_buffer() implementation is
going to use we have to allocate this scratch buffers after the linesize
is known. It was pretty safe for 8 bit per pixel pixel formats since we
always allocated memory for up to 16 bits per pixel. It broke hoever
with cmdutis.c's alloc_buffer() and high pixel bit depth since it
allocated larger edges than mpegvideo expected.
Fixes fuzzed sample nasa-8s2.ts_s244342.
2012-12-18 19:48:30 +01:00
Michael Niedermayer
ed2d7d5868
ff_h264_direct_ref_list_init: fix B slice check.
...
Fixes null pointer dereference.
Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
2012-12-18 19:44:22 +01:00
Janne Grunau
73ad2c2fa7
h264: increase dist_scale_factor for up to 32 references
...
Compute dist_scale_factor_field only for MBAFF since that is the only
case in which it is used.
2012-12-18 19:36:58 +01:00
Michael Niedermayer
5c2fc3bdd7
Merge remote-tracking branch 'qatar/master'
...
* qatar/master:
configure: formatting cosmetics
h264: use mbaff ref indices in fill_colmap() only for mbaff references
Conflicts:
libavcodec/h264_direct.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2012-12-18 15:00:05 +01:00
Michael Niedermayer
14f79ba18f
h264: remove redundant parts of old slice in extradata code.
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2012-12-18 14:52:44 +01:00
Michael Niedermayer
99321d1b03
h264: merge old and new "slice in extradata" checks
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2012-12-18 14:50:12 +01:00
Michael Niedermayer
09b4ae8331
Merge commit '61c6eef5456f2bc8b1dc49a0a759c975551cea29'
...
* commit '61c6eef5456f2bc8b1dc49a0a759c975551cea29':
h264: prevent decoding of slice NALs in extradata
doxy: Clarify what avpriv_set_pts_info does
Conflicts:
libavcodec/h264.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2012-12-18 14:38:10 +01:00
Michael Niedermayer
94ecbe23c5
Merge commit 'c35f0e8495e34c2082dcde805e9323c9f6a4cb0a'
...
* commit 'c35f0e8495e34c2082dcde805e9323c9f6a4cb0a':
au: Reorder code so that both muxer and demuxer are under #ifdefs
fate: Move RALF test into lossless audio group
cosmetics: Use consistent names for multiple inclusion guards.
Conflicts:
libavformat/au.c
tests/fate/lossless-audio.mak
tests/fate/real.mak
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2012-12-18 14:27:59 +01:00
Diego Biurrun
523c7bd23c
misc typo, style and wording fixes
2012-12-18 13:36:51 +01:00
Michael Niedermayer
c9aab8a123
h264: use mbaff ref indices in fill_colmap() only for mbaff references
...
Prevents writing beyond array bounds.
Signed-off-by: Janne Grunau <janne-libav@jannau.net>
2012-12-18 11:02:23 +01:00
Janne Grunau
61c6eef545
h264: prevent decoding of slice NALs in extradata
...
It is not posible to call get_buffer during frame-mt codec
initialization. Libavformat might pass huge amounts of data as
extradata after parsing broken files. The 'extradata' for the fuzzed
sample sample_varPAR_s5374_r001-02.avi is 2.8M large and contains
multiple slices.
2012-12-18 11:01:14 +01:00
Clément Bœsch
8b63744f48
Fix "bistream" typo and add a check in tools/patcheck.
2012-12-18 02:47:34 +01:00
Carl Eugen Hoyos
a71de9a2a2
Fix typo in mvc decoder.
2012-12-18 01:58:17 +01:00
Michael Niedermayer
41bebda485
mjpegenc: fix restart interval parameters for yuv444
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2012-12-18 01:21:48 +01:00
Michael Niedermayer
28b85b1fff
mjpegenc: fix YUV444 with w%16!=0
...
Fixes Ticket2040
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2012-12-18 01:21:48 +01:00
Diego Biurrun
81c7c817a4
cosmetics: Use consistent names for multiple inclusion guards.
2012-12-17 17:02:22 +01:00
Peter Ross
746b1dcc98
Silicon Graphics Motion Video Compressor 1 & 2 decoder
...
Signed-off-by: Peter Ross <pross@xvid.org>
2012-12-17 20:37:54 +11:00
Peter Ross
afa1617b93
SGI RLE 8-bit decoder
...
Signed-off-by: Peter Ross <pross@xvid.org>
2012-12-17 20:37:54 +11:00
Michael Niedermayer
d28dfa2d42
ac3dec: fix outptr increment.
...
Fixes decoding regression
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2012-12-17 01:35:14 +01:00
Michael Niedermayer
7973a07590
h264: Improve first slice and slice type checks
...
This prevents a null pointer dereference
Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2012-12-17 01:08:19 +01:00
Michael Niedermayer
633ae5a210
mjpegenc: fix 444 block count so it is below 10
...
Fixes Ticket1990
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2012-12-16 15:05:31 +01:00
Michael Niedermayer
dde4832b64
Merge commit '27c8337e595a058347150269d5c2c48281e4285b'
...
* commit '27c8337e595a058347150269d5c2c48281e4285b':
h264-mt: handle NAL_DPAs before calling ff_thread_finish_setup
lavr: move AudioMix struct definition to audio_mix.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2012-12-16 13:09:30 +01:00
Paul B Mahol
f4fe4fa89f
Remove 8SVX_RAW on next lavc mayor bump
...
Signed-off-by: Paul B Mahol <onemda@gmail.com>
2012-12-16 11:40:26 +00:00
Michael Niedermayer
d7599bd8e2
h264: dont mess with frame gaps on second fields.
...
Fixes assertion failure
Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2012-12-16 00:28:36 +01:00
Piotr Bandurski
388241efa2
mpegvideo_enc/rv20: width and height must be multiple of 4
...
RealPlayer does not play rv20 files when sizes are not multiple of 4
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2012-12-15 21:28:45 +01:00
Janne Grunau
a421bbfe83
h264: fix memleak on error during SPS parsing
...
Introduced in d7d6efe42b
.
2012-12-15 19:16:39 +01:00
Janne Grunau
27c8337e59
h264-mt: handle NAL_DPAs before calling ff_thread_finish_setup
...
Since a NAL_DPA can start a new frame it has to be handled before
ff_thread_finish_setup is called.
2012-12-15 19:06:37 +01:00
Michael Niedermayer
2b643855e0
dirac_parser: check prev_pu_offset before using it
...
Fixes out of array read
Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2012-12-15 16:04:49 +01:00
Piotr Bandurski
fef75ef200
mpegvideo_enc/rv10: width and hieghtmust be multiple of 16
...
RealPlayer does not play correctly rv10 files when sizes are not multiple of 16
"RealVideo Encoder 1.0 supports any size image that is a multiple of sixteen pixels."
Reviewed-by: Nicolas George <nicolas.george@normalesup.org>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2012-12-15 16:04:49 +01:00
Michael Niedermayer
f186ecc164
Merge commit 'bb675d3ac6d722d5e117ae9042a996b55ca05b1d'
...
* commit 'bb675d3ac6d722d5e117ae9042a996b55ca05b1d':
vp56: make parse_header return standard error codes
Conflicts:
libavcodec/vp56.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2012-12-15 13:41:06 +01:00
Stefano Sabatini
96d815fc0c
lavc: add pkt_size field to AVFrame
2012-12-15 11:46:30 +01:00
Michael Niedermayer
b6671787db
flashsv2_prime: check block before using it.
...
Fixes null pointer dereference
Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2012-12-15 00:19:52 +01:00
Michael Niedermayer
02d6d05339
dcadec: check xch_base_channel against channel_order_tab.
...
Fix null pointer dereference
Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2012-12-14 23:37:44 +01:00
Michael Niedermayer
51fcf276f8
mp3on4: fix null pointer dereference
...
Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2012-12-14 21:50:43 +01:00
Michael Niedermayer
a99c273a3f
dnxhddec: fix CID changed check.
...
Fixes Null pointer dereference
Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2012-12-14 20:58:01 +01:00
Michael Niedermayer
6ca2465556
ass_split_section: dont overread array
...
Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2012-12-14 18:10:35 +01:00
Michael Niedermayer
3c5c6b9d61
Merge remote-tracking branch 'qatar/master'
...
* qatar/master:
ivi_common: check that scan pattern is set before using it.
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2012-12-14 16:05:12 +01:00
Michael Niedermayer
be26232efa
Merge commit '07acdd651d1e2f4cfa5f610e616e70e323bb69cd'
...
* commit '07acdd651d1e2f4cfa5f610e616e70e323bb69cd':
ivi_common: use proper logging context in ivi_decode_blocks().
ivi_common: make some functions and tables static.
asyncts: ignore min_delta only if first_pts is set
Conflicts:
libavcodec/ivi_common.c
libavcodec/ivi_common.h
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2012-12-14 15:56:56 +01:00
Michael Niedermayer
a01fe55077
Merge commit 'c0dc57f1264dad1e121772d03abdb9e14ed8857f'
...
* commit 'c0dc57f1264dad1e121772d03abdb9e14ed8857f':
asyncts: merge two conditions
x86inc: fully concatenate tokens to fix macro expansion for nasm
h264: initialize frame-mt context copies properly
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2012-12-14 15:43:46 +01:00
Michael Niedermayer
2f265d9087
Merge commit '6a27ae28f9bde981e85c82cf5bf42c5f43fb6f13'
...
* commit '6a27ae28f9bde981e85c82cf5bf42c5f43fb6f13':
mpegvideo: treat delayed pictures as used
Conflicts:
libavcodec/h264.h
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2012-12-14 15:36:37 +01:00
Michael Niedermayer
86b4dc6277
Merge commit 'bd255f9feb4deea4c990e582f0ba3b90d7b64b4c'
...
* commit 'bd255f9feb4deea4c990e582f0ba3b90d7b64b4c':
lavc: set frame parameters after decoding only if necessary
Conflicts:
libavcodec/utils.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2012-12-14 15:30:12 +01:00
Michael Niedermayer
3b5c0f5e36
h264: remove low_delay/has_b_frame setting code from nal loop
...
This code is now executed in h264_set_parameter_from_sps()
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2012-12-14 15:22:19 +01:00
Michael Niedermayer
b9d887c225
Merge commit '072be3e8969f24113d599444be4d6a0ed04a6602'
...
* commit '072be3e8969f24113d599444be4d6a0ed04a6602':
h264: set parameters from SPS whenever it changes
asyncts: cosmetics: reindent
Conflicts:
libavcodec/h264.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2012-12-14 15:17:51 +01:00
Michael Niedermayer
593f5c0f3c
Merge commit '8083332c2de9ee189f96844ff4c2d9be1844116f'
...
* commit '8083332c2de9ee189f96844ff4c2d9be1844116f':
asyncts: use clipped delta value when setting resample compensation
asyncts: fix flushing of final samples at EOF
vp6: properly fail on unsupported feature
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2012-12-14 13:51:20 +01:00