Michael Niedermayer
e91fd754c6
avcodec/ansi: Check x/y
...
This prevents out of array accesses
Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-05-02 02:15:40 +02:00
Michael Niedermayer
c1f2c4c3b4
vmdav: Try to fix unpack_rle()
...
This fixes out of array accesses
The code prior to this commit could not have worked, thus obviously
was untested. I was also not able to find a valid sample that uses this
code.
This fix is thus only based on the description of the format
If someone has a sample that uses unpack_rle(), please mail me.
Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-05-01 23:51:05 +02:00
Michael Niedermayer
d602f16a37
Merge remote-tracking branch 'cigaes/master'
...
* cigaes/master:
lavc: copy subtitle_header when copying context.
lavf: data muxer and demuxer.
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-05-01 20:16:26 +02:00
Michael Niedermayer
67731ef40f
Merge remote-tracking branch 'qatar/master'
...
* qatar/master:
avutil: doxy: Small clarification for av_buffer_create()
avcodec: doxy: Clarify how to use buf[] when implementing get_buffer2()
avcodec: doxy: Clarify what get_buffer2 must fill in buf[]
Conflicts:
libavutil/buffer.h
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-05-01 18:33:30 +02:00
Michael Niedermayer
dbcf7e9ef7
Merge commit ' 7f75f2f2bd'
...
* commit '7f75f2f2bd ':
ppc: Drop unnecessary ff_ name prefixes from static functions
x86: Drop unnecessary ff_ name prefixes from static functions
arm: Drop unnecessary ff_ name prefixes from static functions
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-05-01 18:21:35 +02:00
Michael Niedermayer
04fa818779
Merge commit ' 088f38a4f9'
...
* commit '088f38a4f9 ':
avcodec: Drop unnecessary ff_ name prefixes from static functions
Conflicts:
libavcodec/ass.c
libavcodec/h264_parser.c
libavcodec/utils.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-05-01 18:16:32 +02:00
Michael Niedermayer
cae8f469fe
Merge commit ' 38282149b6'
...
* commit '38282149b6 ':
ppc: More consistent arch initialization
Conflicts:
libavcodec/fft.h
libavcodec/mpegaudiodsp.c
libavcodec/mpegaudiodsp.h
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-05-01 18:08:13 +02:00
Michael Niedermayer
ebd99ff112
Merge commit ' 42b9150b0d'
...
* commit '42b9150b0d ':
fft: Remove pointless #ifdefs around function declarations
ppc: Move AltiVec utility headers out of AltiVec ifdefs
Conflicts:
libavcodec/fft.h
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-05-01 18:02:36 +02:00
Michael Niedermayer
3ad5d8694c
Merge commit ' 6b110d3a73'
...
* commit '6b110d3a73 ':
ppc: More consistent names for H.264 optimizations files
mpegaudiosp: More consistent names for ppc/x86 optimization files
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-05-01 17:53:33 +02:00
Nicolas George
ceb33f3aee
lavc: copy subtitle_header when copying context.
...
Fix trac ticket #2489 .
2013-05-01 11:56:34 +02:00
Michael Niedermayer
52fa2945b5
Merge commit ' e036bb7899'
...
* commit 'e036bb7899 ':
lavc: clear AVBuffers on decoded frames if refcounted_frames is not set
FATE: add an additional indeo3 test
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-05-01 10:00:08 +02:00
Michael Niedermayer
d8b6557c86
Merge commit ' bda9e6d923'
...
* commit 'bda9e6d923 ':
indeo3: use put_pixels instead of put_no_rnd_pixels in copy_cell()
Conflicts:
libavcodec/indeo3.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-05-01 09:51:37 +02:00
Michael Niedermayer
71091698a2
Merge commit ' 95220be1fa'
...
* commit '95220be1fa ':
indeo3: fix off by one in MV validity check
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-05-01 09:45:09 +02:00
Michael Niedermayer
fbaf75b166
h264: Use the correct croping values.
...
This fixes returning pictures with corrupted data pointers.
Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-05-01 00:06:26 +02:00
Michael Niedermayer
5299ee54a7
h264: assert that croping values at slice level are consistent
...
These values where checked before already.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-04-30 23:49:56 +02:00
Michael Niedermayer
c3bd306e78
h264_ps: check croping values
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-04-30 23:48:53 +02:00
Derek Buitenhuis
00b8e650e8
avcodec: doxy: Clarify how to use buf[] when implementing get_buffer2()
...
Signed-off-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
2013-04-30 13:33:43 -04:00
Derek Buitenhuis
4cdb3c50b5
avcodec: doxy: Clarify what get_buffer2 must fill in buf[]
...
Signed-off-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
2013-04-30 13:32:58 -04:00
Diego Biurrun
7f75f2f2bd
ppc: Drop unnecessary ff_ name prefixes from static functions
2013-04-30 16:10:06 +02:00
Diego Biurrun
f2e9d44a57
x86: Drop unnecessary ff_ name prefixes from static functions
2013-04-30 16:02:03 +02:00
Diego Biurrun
383fd4d478
arm: Drop unnecessary ff_ name prefixes from static functions
2013-04-30 16:02:03 +02:00
Diego Biurrun
088f38a4f9
avcodec: Drop unnecessary ff_ name prefixes from static functions
2013-04-30 16:02:02 +02:00
Michael Niedermayer
53efb2fa09
gif: Fix little endian specific code
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-04-30 13:35:14 +02:00
Diego Biurrun
38282149b6
ppc: More consistent arch initialization
2013-04-30 12:19:45 +02:00
Diego Biurrun
42b9150b0d
fft: Remove pointless #ifdefs around function declarations
2013-04-30 12:19:44 +02:00
Diego Biurrun
a053dbfcfb
ppc: Move AltiVec utility headers out of AltiVec ifdefs
...
Now that the headers themselves have ifdef protection this is no
longer necessary and more consistent with normal include handling.
2013-04-30 12:19:44 +02:00
Diego Biurrun
6b110d3a73
ppc: More consistent names for H.264 optimizations files
2013-04-30 12:19:43 +02:00
Diego Biurrun
643e433bf7
mpegaudiosp: More consistent names for ppc/x86 optimization files
2013-04-30 12:19:43 +02:00
Anton Khirnov
e036bb7899
lavc: clear AVBuffers on decoded frames if refcounted_frames is not set
...
Otherwise some code might mistakenly think it is allowed to unref those
buffers, which would lead to double unref.
2013-04-30 11:15:32 +02:00
Anton Khirnov
bda9e6d923
indeo3: use put_pixels instead of put_no_rnd_pixels in copy_cell()
...
They are the same in this case, except put_pixels also has blocksizes
smaller than 8.
2013-04-30 11:06:03 +02:00
Anton Khirnov
95220be1fa
indeo3: fix off by one in MV validity check
...
CC:libav-stable@libav.org
2013-04-30 11:06:03 +02:00
Michael Niedermayer
01a5a3a2e8
Merge remote-tracking branch 'qatar/master'
...
* qatar/master:
x86: dsputil: Remove a set of pointless #ifs around function declarations
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-04-30 08:42:10 +02:00
Michael Niedermayer
a3030d47e7
Merge commit ' 85f2f82af6'
...
* commit '85f2f82af6 ':
x86: dsputil: cosmetics: Group ff_{avg|put}_pixels16_mmxext() declarations
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-04-30 08:25:24 +02:00
Diego Biurrun
97c56ad796
x86: dsputil: Remove a set of pointless #ifs around function declarations
2013-04-30 01:42:32 +02:00
Diego Biurrun
85f2f82af6
x86: dsputil: cosmetics: Group ff_{avg|put}_pixels16_mmxext() declarations
2013-04-30 01:41:05 +02:00
Michael Niedermayer
16b2472d20
Merge remote-tracking branch 'qatar/master'
...
* qatar/master:
x86: hpeldsp: Remove unused macro definitions
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-04-29 22:01:53 +02:00
Diego Biurrun
20784aa678
x86: hpeldsp: Remove unused macro definitions
2013-04-29 15:57:00 +02:00
Michael Niedermayer
b691bc424f
copy_packet_data: fix memleak
...
This should fix gif fate memleaks
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-04-29 03:08:50 +02:00
Michael Niedermayer
5149407731
Merge remote-tracking branch 'qatar/master'
...
* qatar/master:
aac: check the maximum number of channels
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-04-28 13:54:56 +02:00
Michael Niedermayer
65af5e815a
Merge commit ' 1b6f84a986'
...
* commit '1b6f84a986 ':
h264_refs: Do not print check_opcodes() return value
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-04-28 13:40:47 +02:00
Luca Barbato
a943a132f3
aac: check the maximum number of channels
...
Broken bitstreams could report a larger than specified number of
channels and cause outbound writes.
CC:libav-stable@libav.org
2013-04-28 00:40:33 +02:00
Michael Niedermayer
7f138310fb
ffv1enc: favor version 3 over 2 unless -strict -2 is set
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-04-27 22:48:13 +02:00
Diego Biurrun
1b6f84a986
h264_refs: Do not print check_opcodes() return value
...
The return value provides no useful information and removing the printing
avoids the following warning:
libavcodec/h264_refs.c:788:15: warning: 'i' may be used uninitialized in this function [-Wuninitialized]
2013-04-27 19:13:45 +02:00
Michael Niedermayer
d4868a960b
ffv1dec: remove redundant error message.
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-04-27 16:36:05 +02:00
Michael Niedermayer
ff0b4c08ca
ffv1dec: add code to support frame threading with gop=1 ffv1
...
CODEC_CAP_FRAME_THREADS is not added yet because that would
unconditionally enable it, breaking gop>1 files.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-04-27 16:20:42 +02:00
Michael Niedermayer
1a392fc550
ffv1: Store a flag in the global header that indicates if all frames are keyframes
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-04-27 16:17:29 +02:00
Michael Niedermayer
3fa6c992d9
Merge remote-tracking branch 'qatar/master'
...
* qatar/master:
x86: ac3dsp: Remove 3dnow version of ff_ac3_extract_exponents
Conflicts:
tests/fate/ac3.mak
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-04-27 11:35:03 +02:00
Michael Niedermayer
24bb01f038
avcodec_string: Print the used codec if it differs from the codec_id name.
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-04-27 00:49:14 +02:00
Michael Niedermayer
59a3b6b751
avcodec_string: remove the "(hq)" listing
...
printing "hq" depending on a single video encoding parameter makes
little sense
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-04-27 00:49:12 +02:00
Michael Niedermayer
9a0aa8d02a
avcodec/intrax8: fix regression with wmv3
...
This also decreases dependancies between intrax8 and the outside
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-04-26 23:04:15 +02:00