Michael Niedermayer
48efe9ec86
avcodec/utvideodec: Fix undefined behavior in shift
...
Fixes: asan_heap-oob_2573085_3783_utvideo_rgba_median.avi
Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-11-11 03:35:57 +01:00
Michael Niedermayer
35dcc8a040
avcodec/lagarith: fix integer overflow
...
Fixes: asan_heap-oob_1bf48fa_2513_lag-yuy2.avi
Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-11-11 03:19:49 +01:00
Michael Niedermayer
5dcb99033d
avcodec/wmaprodec: Fix integer overflow in sfb_offsets initialization
...
Fixes out of array read
Fixes: asan_heap-oob_2aec5b0_1828_classical_22_16_2_16000_v3c_0_exclusive_0_29.wma
Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-11-10 23:09:39 +01:00
Jon Morley
8c28a39c2c
options_table.h: min value for colorspace is 0 (AVCOL_SPC_RGB)
...
The min value for colorspace should be zero and not one since the first
valid index into the frame colorspace array is AVCOL_SPC_RGB which is 0.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-11-10 21:18:57 +01:00
Michael Niedermayer
7656c4c6e6
avcodec/utvideodec: fix assumtation that slice_height >= 1
...
Fixes out of array read
Fixes: asan_heap-oob_2573085_3783_utvideo_rgba_median.avi
Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-11-10 19:45:36 +01:00
Michael Niedermayer
e981de81fe
avcodec/lagarith: fix chroma plane width & height
...
Fixes out of array read
Fixes: asan_heap-oob_1bf48fa_2513_lag-yuy2.avi
Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-11-10 17:54:50 +01:00
Michael Niedermayer
f6a8c77afb
avcodec/utils: Fix warning: comparison between enum foo and enum bar [-Wenum-compare]
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-11-10 02:54:24 +01:00
Michael Niedermayer
9889b29ff4
avcodec/utils: make sidedata remapping table static const
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-11-10 02:53:21 +01:00
Martin Storsjö
b44a242c3d
libfdk-aacdec: Support building with the latest version of fdk-aac
...
The latest fdk-aac code drop (from android 5.0) changed the channel
layout enums (changing the value of existing enum constants), and
renamed the option for downmixing.
The failsafe comparison between ctype and FF_ARRAY_ELEMS(channel_counts)
can trigger warnings (-Wtautological-constant-out-of-range-compare)
when building with the old FDK AAC releases, where it can't be
out of range with the enum values used there.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-11-10 02:46:46 +01:00
Michael Niedermayer
0960cc4cc6
Merge commit ' e3e317e0c0'
...
* commit 'e3e317e0c0 ':
lavc: Compact the side-data passthrough
Conflicts:
libavcodec/utils.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-11-10 00:57:41 +01:00
Lukasz Marek
db2caf0a80
lavc/options: fix shallow copy context
...
avcodec_copy_context leaves shallow copy of string/binary/dict options.
Double free/accessing freed memory may occur.
Signed-off-by: Lukasz Marek <lukasz.m.luki2@gmail.com>
2014-11-09 17:56:08 +01:00
Luca Barbato
e3e317e0c0
lavc: Compact the side-data passthrough
2014-11-09 12:29:59 +01:00
Michael Niedermayer
55d592f7d9
avcodec/aacdec: Skip processing channel elements which have not been present
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-11-09 11:41:13 +01:00
Michael Niedermayer
f9fa560597
avcodec/aacenc: check input for NaN
...
Fixes Ticket3762
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-11-08 23:32:39 +01:00
Carl Eugen Hoyos
e2e36a739d
Fix make checkheaders for libavcodec/vorbis_parser.h.
2014-11-08 00:59:37 +01:00
Michael Niedermayer
960c573cc5
avcodec/mjpegdec: support pix fmt id 0x22111111
...
Fixes: 4163724_300.jpg
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-11-07 15:37:11 +01:00
Rong Yan
79e0255956
libavcodec/ppc/hpeldsp_altivec.c : fix ff_put_pixels16_altivec() put_no_rnd_pixels16_xy2_altivec() put_no_rnd_pixels8_xy2_altivec() avg_pixels8_altivec() avg_pixels8_xy2_altivec() put_pixels16_xy2_altivec() put_pixels8_xy2_altivec() ff_avg_pixels16_altivec() for POWER LE
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-11-07 12:32:03 +01:00
Michael Niedermayer
b1c99f4c5f
avcodec/aacdec: Add table of profile names
...
based on tables of aac encoders from libavcodec
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-11-07 03:09:50 +01:00
Michael Niedermayer
2daae445c0
avcodec/aacdec: print extension type when startcode debugging is on
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-11-07 03:09:50 +01:00
Michael Niedermayer
c53a1507aa
Merge commit ' 199d9f995d'
...
* commit '199d9f995d ':
mjpegdec: fix undefined shift
Conflicts:
libavcodec/mjpegdec.c
See: b432960528
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-11-06 18:28:49 +01:00
Michael Niedermayer
ad0cf8e063
Merge commit ' ac4a5e3abd'
...
* commit 'ac4a5e3abd ':
pthreads_frame: Do not leak on failure path
See: 11679e1b90
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-11-06 18:17:33 +01:00
Michael Niedermayer
98d6f0ffef
Merge commit ' 37b3361e75'
...
* commit '37b3361e75 ':
mpeg12enc: factor out check in encode_dc
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-11-06 17:28:40 +01:00
Michael Niedermayer
c96a44d0dd
Merge commit ' 0a66647061'
...
* commit '0a66647061 ':
mpegvideo_enc: factor out denominator and explicitly cast operands
Conflicts:
libavcodec/mpegvideo_enc.c
See: c753b56b4d
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-11-06 17:21:36 +01:00
Michael Niedermayer
5241f90058
Merge commit ' e0a1d0a2b0'
...
* commit 'e0a1d0a2b0 ':
mpegvideo_enc: rework direct mode check
Conflicts:
libavcodec/mpegvideo_enc.c
See: ad98567198
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-11-06 17:14:38 +01:00
Vittorio Giovara
199d9f995d
mjpegdec: fix undefined shift
...
Add a comment to explain the code.
CC: libav-stable@libav.org
Bug-Id: CID 1194388
2014-11-06 10:44:46 -05:00
Luca Barbato
ac4a5e3abd
pthreads_frame: Do not leak on failure path
...
CC: libav-stable@libav.org
Bug-Id: CID 1135767
Signed-off-by: Vittorio Giovara <vittorio.giovara@gmail.com>
2014-11-06 10:44:46 -05:00
Vittorio Giovara
37b3361e75
mpeg12enc: factor out check in encode_dc
...
Makes coverity less confused and the code more readable.
CC: libav-stable@libav.org
Bug-Id: CID 751744
2014-11-06 10:44:46 -05:00
Vittorio Giovara
0a66647061
mpegvideo_enc: factor out denominator and explicitly cast operands
...
CC: libav-stable@libav.org
Bug-Id: CID 608053
2014-11-06 10:44:46 -05:00
Vittorio Giovara
e0a1d0a2b0
mpegvideo_enc: rework direct mode check
...
Remove stray semicolon and share codepaths.
CC: libav-stable@libav.org
Bug-Id: CID 991857
2014-11-06 10:44:46 -05:00
Vittorio Giovara
5d29efe4b0
mpeg12dec: simplify context duplication
...
CC: libav-stable@libav.org
Bug-Id: CID 717453 / CID 717454 / CID 717915
2014-11-06 10:44:46 -05:00
Michael Niedermayer
e591608753
avcodec/xiph: make extradata argument const
...
Fixes "warning: passing argument 1 of avpriv_split_xiph_headers discards const qualifier from pointer target type"
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-11-06 14:41:38 +01:00
Michael Niedermayer
cffd2713e9
Merge commit ' acc897e6b1'
...
* commit 'acc897e6b1 ':
lavc: make avpriv_flac_is_extradata_valid() private on the next bump
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-11-06 14:17:46 +01:00
Michael Niedermayer
cfef947f7f
Merge commit ' c070a87515'
...
* commit 'c070a87515 ':
lavc: make avpriv_flac_parse_streaminfo() private on the next bump
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-11-06 13:54:11 +01:00
Michael Niedermayer
b6a9956396
Merge commit ' 7784f47762'
...
* commit '7784f47762 ':
lavf: stop using avpriv_flac_parse_streaminfo()
Conflicts:
libavcodec/Makefile
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-11-06 13:42:41 +01:00
Michael Niedermayer
f74be3669d
Merge commit ' 2f3fadfbe3'
...
* commit '2f3fadfbe3 ':
lavc,lavf: switch to the new vorbis parse API
Conflicts:
libavformat/oggparsevorbis.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-11-06 12:05:17 +01:00
Michael Niedermayer
7ffdc7bef2
avcodec/export av_vorbis_parse_frame_flags()
...
The other functions where changed in the previous merge
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-11-06 11:58:32 +01:00
Michael Niedermayer
44fa2671e0
Merge commit ' 5e80fb7ff2'
...
* commit '5e80fb7ff2 ':
lavc: add a public API for parsing vorbis packets.
Conflicts:
doc/APIchanges
libavcodec/Makefile
libavcodec/version.h
libavcodec/vorbis_parser.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-11-06 11:21:47 +01:00
Michael Niedermayer
5f7887ca8d
Merge commit ' 6896f95b24'
...
* commit '6896f95b24 ':
vorbis_parser: add an AV prefix to VorbisParseContext
Conflicts:
libavcodec/vorbis_parser.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-11-06 11:06:19 +01:00
Michael Niedermayer
a0617025dd
Merge commit ' 8747926'
...
* commit '8747926 ':
vorbis_parser: use a dedicated AVClass for logging
Conflicts:
libavcodec/vorbis_parser.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-11-06 10:50:59 +01:00
Anton Khirnov
acc897e6b1
lavc: make avpriv_flac_is_extradata_valid() private on the next bump
2014-11-06 09:04:56 +01:00
Anton Khirnov
c070a87515
lavc: make avpriv_flac_parse_streaminfo() private on the next bump
2014-11-06 09:04:12 +01:00
Anton Khirnov
7784f47762
lavf: stop using avpriv_flac_parse_streaminfo()
...
The only parameters needed by the demuxers are the sample rate and sample
count, which can be trivially extracted manually, without resorting to
an avpriv function.
2014-11-06 09:02:25 +01:00
Anton Khirnov
2f3fadfbe3
lavc,lavf: switch to the new vorbis parse API
2014-11-06 09:00:46 +01:00
Anton Khirnov
5e80fb7ff2
lavc: add a public API for parsing vorbis packets.
...
It is required by (at least) the ogg demuxer.
Mark the current semi-public apriv API for removal.
2014-11-06 08:51:25 +01:00
Anton Khirnov
6896f95b24
vorbis_parser: add an AV prefix to VorbisParseContext
...
This is done in preparation for making it public.
2014-11-06 08:47:54 +01:00
Anton Khirnov
874792641e
vorbis_parser: use a dedicated AVClass for logging
...
Currently, the API takes an external AVCodecContext, which is used only
for extradata and logging. This change will allow to it to work without
an AVCodecContext in the following commits.
2014-11-06 08:47:21 +01:00
Michael Niedermayer
817663897e
avcodec/mpegaudio_parser: fix off by 1 error in bitrate calculation
...
Fixes Ticket3918
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-11-06 00:05:22 +01:00
Reimar Döffinger
a26d0ffa18
vdpau_mpeg4: Do not fail on unknown profile.
...
This is a regression, previous code did not require
users to set the profile to use VDPAU.
In addition, ASP is a superset of SP, so there is not
even a good reason to require it.
Signed-off-by: Reimar Döffinger <Reimar.Doeffinger@gmx.de>
2014-11-05 20:07:31 +01:00
Michael Niedermayer
43fee7ad92
Merge commit ' 4ff670d99b'
...
* commit '4ff670d99b ':
hwaccel: Deinitialize hardware acceleration early enough
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-11-05 02:10:46 +01:00
Michael Niedermayer
77f1199e8f
avcodec/mpeg12dec: do not trust AVCodecContext input dimensions
...
Fixes initial wtv dimensions
Fixes Ticket4070
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-11-05 02:00:22 +01:00