Matt Wolenetz
004779cc59
avcodec/utils: Fix leak by dereferencing audio frame when side data causes whole frame skip
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-05-07 01:33:08 +02:00
Michael Niedermayer
974420a701
jpeg2000dec: fix memleaks in error cases in jpeg2000_decode_frame()
...
Reviewed-by: Nicolas BERTRAND <nicoinattendu@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-05-06 22:56:22 +02:00
Clément Bœsch
a82cc54fb5
lavf/mpsub: remove sscanf from probing.
...
This should make probing faster.
2013-05-06 22:50:59 +02:00
Janne Grunau
70f9661542
jpeg2000dec: initialize static data just once
2013-05-06 22:45:47 +02:00
Janne Grunau
45a1694fde
jpeg2000dec: cleanup properly after decoding errors
...
Fixes memory leak in fate-redcode-demux.
2013-05-06 22:27:33 +02:00
Carl Eugen Hoyos
905e1e4b52
Cosmetics: Fix indentation and add braces after last commit.
2013-05-06 21:55:14 +02:00
Carl Eugen Hoyos
8b8fa09b65
vc1dec: Call ff_vdpau_vc1_decode_picture() once for each field.
...
Fixes mplayer -vc ffvc1vdpau for interlaced streams.
2013-05-06 21:55:14 +02:00
Rainer Hochecker
06d8fdb660
Fix vdpau vc1 interlace modes also when using decoder vc1_vdpau.
...
Signed-off-by: Carl Eugen Hoyos <cehoyos@ag.or.at>
2013-05-06 21:55:14 +02:00
Janne Grunau
851465f9d9
fate-jpeg2000-dcinema: force output to xyz12le
...
Fixes Fate tests on big-endian configs.
2013-05-06 21:48:15 +02:00
Janne Grunau
5f87c277bd
vf_scale: add endianness conversion pixel format in query_formats
2013-05-06 21:48:15 +02:00
Janne Grunau
9cfa21c8c2
swscale: support endianness conversion for AV_PIX_FMT_XYZ12
2013-05-06 21:48:14 +02:00
Michael Niedermayer
b3e9fd1fe5
Merge remote-tracking branch 'qatar/master'
...
* qatar/master:
swscale: Use alpha from the right row in yuva2rgba_c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-05-06 21:48:03 +02:00
Michael Niedermayer
050b48f397
Merge commit '6c5eac9a603a91a707d030d96ba97e2ef6b3ce50'
...
* commit '6c5eac9a603a91a707d030d96ba97e2ef6b3ce50':
swscale: Remove unnecessary backslashes
jpeg2000: Fix uninitialized data errors pointed out by valgrind/memcheck
Conflicts:
libavcodec/jpeg2000dec.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-05-06 21:23:29 +02:00
Nicolas Bertrand
a06f0cef5b
jpeg2000: fix for uninitialized data errors in valgrind/memcheck
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-05-06 21:14:19 +02:00
Michael Niedermayer
108e2ae829
Merge commit '110796739ab32854dc0b6b0a1c95e6ae98889062'
...
* commit '110796739ab32854dc0b6b0a1c95e6ae98889062':
x86: hpeldsp: Move avg_pixels8_x2_mmx() out of hpeldsp_rnd_template.c
Conflicts:
libavcodec/x86/Makefile
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-05-06 21:00:40 +02:00
Michael Niedermayer
a6e782434a
Merge commit 'dc1b328d0df6e5ad5ff0ca4ae031e08466624f9c'
...
* commit 'dc1b328d0df6e5ad5ff0ca4ae031e08466624f9c':
x86: hpeldsp: Only compile MMX hpeldsp code if MMX is enabled
Conflicts:
libavcodec/x86/Makefile
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-05-06 20:53:37 +02:00
Michael Niedermayer
32cc7dacde
Merge commit '9e5e76ef9ea803432ef2782a3f528c3f5bab621e'
...
* commit '9e5e76ef9ea803432ef2782a3f528c3f5bab621e':
x86: More specific ifdefs for dsputil/hpeldsp init functions
Conflicts:
libavcodec/x86/dsputil_mmx.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-05-06 20:46:27 +02:00
Janne Grunau
c1eb3e7fec
swscale: add support for endianness only conversion
...
Use bitfields in FormatEntry array to avoid wasting an int for each flag.
2013-05-06 18:55:58 +02:00
Janne Grunau
74652af821
pixdesc: add function to return pixel format with swapped endiannes
2013-05-06 18:51:47 +02:00
Michael Niedermayer
8cdf95d9b8
snow: add av_cold where appropriate
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-05-06 16:58:17 +02:00
Michael Niedermayer
f4341c64be
avfilter: add av_cold to uninit()
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-05-06 16:55:06 +02:00
Martin Storsjö
6e293d111f
swscale: Use alpha from the right row in yuva2rgba_c
...
Every other pixel had the alpha channel taken from the wrong
row.
This fixes bug 504.
CC: libav-stable@libav.org
Signed-off-by: Martin Storsjö <martin@martin.st>
2013-05-06 17:40:25 +03:00
Martin Storsjö
6c5eac9a60
swscale: Remove unnecessary backslashes
...
Signed-off-by: Martin Storsjö <martin@martin.st>
2013-05-06 17:40:19 +03:00
Michael Niedermayer
d2bf8aecd3
j2kdec: frame multithreading support
...
This allows comparing the 2 decoders with threads
Based on:commit 2e2d24667a
By: Nicolas Bertrand <nicoinattendu@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-05-06 16:38:03 +02:00
highgod0401
b02f073ad4
lavfi/deshake_opencl: use ff_opencl_set_parameter
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-05-06 16:30:22 +02:00
Nicolas Bertrand
28816f9db8
jpeg2000: Fix uninitialized data errors pointed out by valgrind/memcheck
...
Signed-off-by: Diego Biurrun <diego@biurrun.de>
2013-05-06 13:07:00 +02:00
Michael Niedermayer
0b5f4fdc38
Merge remote-tracking branch 'cehoyos/master'
...
* cehoyos/master:
Remove a superfluous include from libavcodec/options_table.h.
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-05-06 12:43:08 +02:00
Carl Eugen Hoyos
76f43cbe26
Remove a superfluous include from libavcodec/options_table.h.
2013-05-06 12:16:50 +02:00
highgod0401
e215cb5e96
lavfi/unsharp_opencl: use av_opencl_errstr
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-05-06 12:08:22 +02:00
highgod0401
41aa199998
lavu/opencl_internal: use av_opencl_errstr
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-05-06 12:08:04 +02:00
highgod0401
9a09a9fc43
lavfi/unsharp: fix opencl crash on 64bit linux
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-05-06 11:45:40 +02:00
Diego Biurrun
110796739a
x86: hpeldsp: Move avg_pixels8_x2_mmx() out of hpeldsp_rnd_template.c
...
The function is only instantiated once, so there is no point
in keeping it in a template file.
2013-05-06 11:02:08 +02:00
Diego Biurrun
dc1b328d0d
x86: hpeldsp: Only compile MMX hpeldsp code if MMX is enabled
2013-05-06 11:02:08 +02:00
Diego Biurrun
9e5e76ef9e
x86: More specific ifdefs for dsputil/hpeldsp init functions
2013-05-06 11:02:07 +02:00
Michael Niedermayer
09602dbe7a
wav_seek_tag: fix integer overflow
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-05-06 10:58:31 +02:00
Michael Niedermayer
5cb9093aa8
Merge remote-tracking branch 'qatar/master'
...
* qatar/master:
wav: Always seek to an even offset
Conflicts:
libavformat/wavdec.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-05-06 10:47:49 +02:00
Michael Niedermayer
77c85cbd9d
Merge commit '46c1917350f58dfab84e41919e6c02d43950db8c'
...
* commit '46c1917350f58dfab84e41919e6c02d43950db8c':
nut: use a define for the nut version
bgmc: Do not mark ff_bgmc_decode_init() as av_cold
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-05-06 10:41:43 +02:00
Michael Niedermayer
b50ab3a4c7
Merge commit 'bd8ac882140a38868c33c000a430a1292a352533'
...
* commit 'bd8ac882140a38868c33c000a430a1292a352533':
avcodec: Add av_cold attributes to end functions missing them
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-05-06 10:28:27 +02:00
Michael Niedermayer
5c2ccf83df
Merge commit '7abd35a1ffaecfd79fa07b801621ee11ab595c43'
...
* commit '7abd35a1ffaecfd79fa07b801621ee11ab595c43':
avformat: Add av_cold attributes to init functions missing them
Conflicts:
libavformat/rtpdec_xiph.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-05-06 10:19:56 +02:00
Luca Barbato
ac87eaf856
wav: Always seek to an even offset
...
RIFF chunks are aligned to 16bit according to the specification.
Bug-Id:500
CC:libav-stable@libav.org
2013-05-06 09:14:43 +02:00
Luca Barbato
46c1917350
nut: use a define for the nut version
...
Ease switching version in the future and make evident why that value.
2013-05-06 09:14:43 +02:00
Paul B Mahol
f5846dc98c
id3v2: stop ignoring text encoding for chapter titles
...
Signed-off-by: Paul B Mahol <onemda@gmail.com>
2013-05-06 00:54:13 +00:00
Michael Niedermayer
5a9e376049
h264: check mb_width/height
...
Fixes inconsistency that leads to out of array accesses with threads
Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-05-06 01:58:10 +02:00
Michael Niedermayer
edabbfbaf2
ff_h264_decode_seq_parameter_set: dont set h->sps
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-05-06 00:37:47 +02:00
Michael Niedermayer
26482ae716
h264_sei/decode_picture_timing: do not depend on h->sps being set
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-05-06 00:35:25 +02:00
Michael Niedermayer
ccdaa31d86
ff_h264_decode_picture_parameter_set: fix return code
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-05-06 00:01:47 +02:00
Michael Niedermayer
dc35b77b28
ff_h264_decode_picture_parameter_set: use the correct sps
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-05-06 00:01:05 +02:00
Diego Biurrun
2d5fd7886a
bgmc: Do not mark ff_bgmc_decode_init() as av_cold
...
The function is possibly called once per block.
2013-05-05 20:51:52 +02:00
Diego Biurrun
bd8ac88214
avcodec: Add av_cold attributes to end functions missing them
2013-05-05 20:51:28 +02:00
Carl Eugen Hoyos
7c23922c2b
Cosmetics: Reindent Sierra vmd demuxer after last commit.
2013-05-05 19:56:46 +02:00