13b353a7cb
avcodec/asvdec: dont fail without extradata
...
extradata is not mandatory to decode asv
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-09-20 12:51:22 +02:00
1e9a850df9
Merge commit 'f50803354c6acb4575379d7c54ca48ec5d36dd61'
...
* commit 'f50803354c6acb4575379d7c54ca48ec5d36dd61':
asvdec: Verify the amount of extradata
See: 605f2b6b00
2013-09-20 12:49:15 +02:00
9c8aeacf82
avutil: add av_get_colorspace_name()
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-09-19 22:14:13 +02:00
3185a80259
fraps: Make the input buffer size checks more strict
...
Reported-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
CC: libav-stable@libav.org
Signed-off-by: Martin Storsjö <martin@martin.st>
2013-09-19 22:45:59 +03:00
601c2015bc
svq3: Avoid a division by zero
...
If the height is zero, the decompression will probably end up
failing due to not fitting into the allocated buffer later
anyway, so this doesn't need any more elaborate check.
Reported-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
CC: libav-stable@libav.org
Signed-off-by: Martin Storsjö <martin@martin.st>
2013-09-19 22:45:16 +03:00
7a5a557227
qpeg: Add checks for running out of rows in qpeg_decode_inter
...
Reported-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
CC: libav-stable@libav.org
Signed-off-by: Martin Storsjö <martin@martin.st>
2013-09-19 22:44:39 +03:00
e9d61de96c
mpegaudiodec: Validate that the number of channels fits at the given offset
...
This is similar to the fix in 35cbc98blibav-stable@libav.org
Signed-off-by: Martin Storsjö <martin@martin.st>
2013-09-19 22:44:18 +03:00
f50803354c
asvdec: Verify the amount of extradata
...
The init function reads one byte of extradata.
Reported-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
CC: libav-stable@libav.org
Signed-off-by: Martin Storsjö <martin@martin.st>
2013-09-19 22:43:55 +03:00
93648ee47b
Merge remote-tracking branch 'qatar/master'
...
* qatar/master:
rv34: Fix a memory leak on errors
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-09-19 13:49:17 +02:00
b4c88a4c4c
Merge commit '5372cda67109848d22146289e401669266217e80'
...
* commit '5372cda67109848d22146289e401669266217e80':
rv10: Validate the dimensions set from the container
This check could be replaced by a width==0||height==0
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-09-19 13:28:32 +02:00
32ea39f56d
Merge commit '1914e6f010b3320025c7b692aaea51d9b9a992a8'
...
* commit '1914e6f010b3320025c7b692aaea51d9b9a992a8':
aacdec: Add support for LD (Low Delay) AAC
Conflicts:
Changelog
libavcodec/aacdec.c
libavcodec/version.h
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-09-19 12:55:26 +02:00
257f11820b
Merge commit '5cdefc02079a5b899bdec09e15e2bb099cb01734'
...
* commit '5cdefc02079a5b899bdec09e15e2bb099cb01734':
aacdec: Add support for Error Resilience syntax.
Conflicts:
Changelog
libavcodec/aacdec.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-09-19 12:44:06 +02:00
b26ccf218d
Merge commit 'c4bfa098072ba338d83555d6e2199f7e1e64ffff'
...
* commit 'c4bfa098072ba338d83555d6e2199f7e1e64ffff':
Add a WebP decoder
Conflicts:
Changelog
doc/general.texi
libavcodec/Makefile
libavcodec/avcodec.h
libavcodec/version.h
libavformat/img2.c
The previously existing webp decoder is disabled as the new
one supports lossless mode and alpha while the previous does not.
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-09-19 12:36:11 +02:00
ac2fc63ac6
Merge commit '9ae53c5860e17d087642d27b00dade071970a2e7'
...
* commit '9ae53c5860e17d087642d27b00dade071970a2e7':
lavc: add ff_u8_to_s8() for safe type punning of uint8_t to int8_t
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-09-19 11:47:40 +02:00
fdbd924b84
rv34: Fix a memory leak on errors
...
Signed-off-by: Martin Storsjö <martin@martin.st>
2013-09-19 11:09:18 +03:00
5372cda671
rv10: Validate the dimensions set from the container
...
Reported-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
CC: libav-stable@libav.org
Signed-off-by: Martin Storsjö <martin@martin.st>
2013-09-19 11:08:54 +03:00
1914e6f010
aacdec: Add support for LD (Low Delay) AAC
2013-09-18 12:01:53 -07:00
5cdefc0207
aacdec: Add support for Error Resilience syntax.
...
This does not add support for any error resilience tools.
2013-09-18 12:01:49 -07:00
c4bfa09807
Add a WebP decoder
...
Container and lossy decoding by Aneesh Dogra <aneesh@sugarlabs.org>
Lossless decoding by Justin Ruggles <justin.ruggles@gmail.com>
2013-09-18 14:10:05 -04:00
9ae53c5860
lavc: add ff_u8_to_s8() for safe type punning of uint8_t to int8_t
2013-09-18 14:10:05 -04:00
015f7ce7d7
Merge commit 'c77d409bf95954aceb762dd800d1ee2868c4b0d4'
...
* commit 'c77d409bf95954aceb762dd800d1ee2868c4b0d4':
twinvqdec: Check the ibps parameter separately
See: b8dc5f8bb398b377004d
2013-09-18 12:42:19 +02:00
f9ccdcb6ce
Merge commit '8411baf6f0a42bdd61f00f34aa9efec7e138b5f2'
...
* commit '8411baf6f0a42bdd61f00f34aa9efec7e138b5f2':
dca_parser: Handle changes in DCA frame size
Conflicts:
libavcodec/dca_parser.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-09-18 10:39:34 +02:00
2dd38a1d48
avcodec/jpeg2000dec: move "missing SIZ" check up
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-09-18 10:04:43 +02:00
8ae14bf5ce
Merge commit '18a245a2aea31b92bc435f2962a71e060d83b5f7'
...
* commit '18a245a2aea31b92bc435f2962a71e060d83b5f7':
jpeg2000dec: Add more checks when parsing headers
The check cannot be true in FFmpeg, but does no harm.
I will move it in a subsequent commit so it can detect missing SIZ
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-09-18 10:03:35 +02:00
c77d409bf9
twinvqdec: Check the ibps parameter separately
...
This is required, since invalid parameters actually could
pass the switch check below.
Reported-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
CC: libav-stable@libav.org
Signed-off-by: Martin Storsjö <martin@martin.st>
2013-09-17 23:22:46 +03:00
8411baf6f0
dca_parser: Handle changes in DCA frame size
...
A change in framesize caused a perpetual loss of synchronization.
So read (and use) the frame size from the frame header instead of
setting it only once.
Signed-off-by: Diego Biurrun <diego@biurrun.de>
2013-09-17 18:16:47 +02:00
fcb069af8f
lavc: Don't export ff_vdpau_vc1_decode_picture
...
It's not our responsibility to account for other projects'
terrible hacky usage.
Also, it is no longer needed by XMBC, since 78b71d4.
Signed-off-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
2013-09-17 12:12:21 -04:00
1976976674
Merge commit 'ea78a348d86a3a733f6c1e0a65cfdd8283d924b9'
...
* commit 'ea78a348d86a3a733f6c1e0a65cfdd8283d924b9':
eacmv: Make sure a reference frame exists before referencing it
Conflicts:
libavcodec/eacmv.c
See: 113d7be624
2013-09-17 16:47:18 +02:00
028f8c3ecb
Merge commit 'f875a732e36786d49f3650e3235272891a820600'
...
* commit 'f875a732e36786d49f3650e3235272891a820600':
mpeg4videodec: Check the width/height in mpeg4_decode_sprite_trajectory
Conflicts:
libavcodec/mpeg4videodec.c
See: fc5c49ab32
2013-09-17 16:26:59 +02:00
8d0b899e38
Merge commit 'a92538b7c0defc86c55fb91f55dfa36aad192673'
...
* commit 'a92538b7c0defc86c55fb91f55dfa36aad192673':
ivi_common: Make sure color planes have been initialized
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-09-17 16:22:47 +02:00
b3dfda8a41
Merge commit '711c970168297683860422e95d6b7e37ee3c8367'
...
* commit '711c970168297683860422e95d6b7e37ee3c8367':
rv34: Check the return value from ff_rv34_decode_init
Conflicts:
libavcodec/rv30.c
libavcodec/rv40.c
See: b86651a208
2013-09-17 15:38:09 +02:00
7163bbefa2
Merge commit 'e1f3847f860a1094a46be4c5f10db8df616c3135'
...
* commit 'e1f3847f860a1094a46be4c5f10db8df616c3135':
mace: Make sure that the channel count is set to a valid value
Conflicts:
libavcodec/mace.c
See: 6df1cfa7e4
2013-09-17 15:16:01 +02:00
a64b99503b
Merge commit '1115689d54ea95a084421f5a182b8dc56cbff978'
...
* commit '1115689d54ea95a084421f5a182b8dc56cbff978':
svq3: Check for any negative return value from ff_h264_check_intra_pred_mode
Conflicts:
libavcodec/svq3.c
See: 019eb2c77b
2013-09-17 15:07:09 +02:00
18a245a2ae
jpeg2000dec: Add more checks when parsing headers
...
Reported-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
CC: libav-stable@libav.org
Signed-off-by: Martin Storsjö <martin@martin.st>
2013-09-17 15:57:27 +03:00
ede42109e7
x86: Add an xmm clobbering wrapper for avcodec_encode_video2
...
This is required since 187105ff8
2013-09-17 10:53:23 +02:00
ff4548f223
Merge commit '187105ff8a02bafc9c58d9d8363bb3f55a415635'
...
* commit '187105ff8a02bafc9c58d9d8363bb3f55a415635':
Fix references to deleted avcodec_encode_video() function
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-09-17 10:53:14 +02:00
ea78a348d8
eacmv: Make sure a reference frame exists before referencing it
...
This is similar to an existing check for the second-last frame
from 062421e3libav-stable@libav.org
Signed-off-by: Martin Storsjö <martin@martin.st>
2013-09-17 11:33:38 +03:00
f875a732e3
mpeg4videodec: Check the width/height in mpeg4_decode_sprite_trajectory
...
This avoids a potential division by zero.
Reported-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
CC: libav-stable@libav.org
Signed-off-by: Martin Storsjö <martin@martin.st>
2013-09-17 11:33:38 +03:00
a92538b7c0
ivi_common: Make sure color planes have been initialized
...
Reported-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
CC: libav-stable@libav.org
Signed-off-by: Martin Storsjö <martin@martin.st>
2013-09-17 11:33:38 +03:00
b1db33159f
ffv1: Make sure at least one slice context is initialized
...
This avoids crashes when initializing the range coder for
the first slice context.
Reported-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
CC: libav-stable@libav.org
Signed-off-by: Martin Storsjö <martin@martin.st>
2013-09-17 11:33:38 +03:00
c39f7eba01
truemotion2: Use av_freep properly in an error path
...
Reported-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
CC: libav-stable@libav.org
Signed-off-by: Martin Storsjö <martin@martin.st>
2013-09-17 11:33:38 +03:00
711c970168
rv34: Check the return value from ff_rv34_decode_init
...
Reported-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
CC: libav-stable@libav.org
Signed-off-by: Martin Storsjö <martin@martin.st>
2013-09-17 11:33:37 +03:00
e1f3847f86
mace: Make sure that the channel count is set to a valid value
...
Also return a proper error code.
Reported-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
CC: libav-stable@libav.org
Signed-off-by: Martin Storsjö <martin@martin.st>
2013-09-17 11:21:46 +03:00
1115689d54
svq3: Check for any negative return value from ff_h264_check_intra_pred_mode
...
Also pass on any returned error code.
Reported-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
CC: libav-stable@libav.org
Signed-off-by: Martin Storsjö <martin@martin.st>
2013-09-17 11:21:16 +03:00
7129935ed2
avcodec/mjpegdec: Fix ljpeg RCT
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-09-17 02:00:15 +02:00
1daea5232f
x86: Add an xmm clobbering wrapper for avcodec_encode_video2
...
This is required since 187105ff8
2013-09-16 22:22:41 +03:00
7283d2bb90
Merge remote-tracking branch 'qatar/master'
...
* qatar/master:
avpacket: Fix error checking in packet_alloc
Conflicts:
libavcodec/avpacket.c
See: b905a7137a
2013-09-16 14:22:26 +02:00
b3970b3949
Merge commit '6fc8226e29055858f28973bb3d27b63b3b65e616'
...
* commit '6fc8226e29055858f28973bb3d27b63b3b65e616':
vp3: Check the framerate for validity
Conflicts:
libavcodec/vp3.c
See: a56d963f11
2013-09-16 14:10:31 +02:00
187105ff8a
Fix references to deleted avcodec_encode_video() function
2013-09-16 13:59:19 +02:00
e0fcd0294e
Merge commit 'ac9d159015a88aa2721b271875d18482f713f354'
...
* commit 'ac9d159015a88aa2721b271875d18482f713f354':
proresdec: Properly make sure an index doesn't run past the limit
Conflicts:
libavcodec/proresdec_lgpl.c
See: 30df9789a9
2013-09-16 13:42:20 +02:00
18e0dd05df
Merge commit 'e90a6846c2c006fbebd00e1f2789f4a86fafacef'
...
* commit 'e90a6846c2c006fbebd00e1f2789f4a86fafacef':
cavsdec: Make sure a sequence header has been decoded before decoding pictures
See: ec0965be36
2013-09-16 13:04:00 +02:00
85e8192b85
avpacket: Fix error checking in packet_alloc
...
Previously the wrong buffer pointer was checked, when buf
instead of *buf was checked. But checking the return value
instead is even better.
Reported-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
CC: libav-stable@libav.org
Signed-off-by: Martin Storsjö <martin@martin.st>
2013-09-16 11:22:42 +03:00
6fc8226e29
vp3: Check the framerate for validity
...
Reported-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
CC: libav-stable@libav.org
Signed-off-by: Martin Storsjö <martin@martin.st>
2013-09-16 11:04:52 +03:00
ac9d159015
proresdec: Properly make sure an index doesn't run past the limit
...
If idx equaled num_coeffs - 1 on entry to the loop, the previous
check failed to break out of the loop.
Reported-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
CC: libav-stable@libav.org
Signed-off-by: Martin Storsjö <martin@martin.st>
2013-09-16 11:04:52 +03:00
e90a6846c2
cavsdec: Make sure a sequence header has been decoded before decoding pictures
...
Reported-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
CC: libav-stable@libav.org
Signed-off-by: Martin Storsjö <martin@martin.st>
2013-09-16 11:04:52 +03:00
7fb2622456
avcodec/mjpegdec: rgba64 ljpeg support
...
Fixes Ticket2965
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-09-16 03:00:54 +02:00
1e4e0bd907
avcodec/mjpegdec: change error return value to be outside the 16bit range
...
Fixes part of Ticket2965
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-09-16 02:59:33 +02:00
b4a5fcb998
avcodec/mjpegdec: Fix rgb48 ljpeg
...
Fixes Ticket894
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-09-15 23:36:11 +02:00
04427182bc
avcodec: typo fix sepera* → separa*
2013-09-15 21:32:42 +02:00
4f1a17b1a9
avcodec/c93: force dimensions to the correct value instead of depending on the demuxer to do so
...
Fixes Ticket2934
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-09-15 20:32:09 +02:00
a06a5b78e2
mathops/x86: work around inline asm miscompilation with GCC 4.8.1
...
The volatile is not required here, and prevents a miscompilation with GCC
4.8.1 when building on x86 with --cpu=i686
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Signed-off-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
2013-09-15 11:15:07 -04:00
821a5938d1
avcodec/g2meet: Fix order of align and pixel size multiplication.
...
Fixes out of array accesses
Fixes Ticket2922
Found-by: ami_stuff
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-09-15 16:33:27 +02:00
e428632c1a
avcodec/jpeg2000dec: print invalid cdx/y values
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-09-15 15:37:16 +02:00
529540759f
avcodec/simple_idct_template: adjust coeffs for 12bit idct
...
This prevents overflows with 12bit jpegs
Fixes Ticket2952
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-09-15 03:21:03 +02:00
1a3d142f1f
avcodec/bfi: check for malloc failure
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-09-14 17:35:48 +02:00
bb5e7d3b5a
avcodec/mationpixels: free memory after malloc failures
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-09-14 17:35:48 +02:00
8134edf3eb
avcodec/cdxl: use av_freep()
...
Signed-off-by: Paul B Mahol <onemda@gmail.com>
2013-09-14 10:45:14 +00:00
8728360b56
avcodec/mationpixels: check for malloc failures
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-09-14 04:12:21 +02:00
108b91c3fe
avcodec/mpeg12dec: clear mpeg_enc_ctx_allocated when contexts are deallocated
...
Fixes Ticket2950
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-09-14 00:31:40 +02:00
6c07e41f43
avcodec/mjpegdec: check for malloc failure of blocks[] and last_nnz[]
...
Fixes null pointer dereference
Fixes Ticket2947
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-09-13 23:25:16 +02:00
23bd0335af
avcodec/g2meet: remove redundant log message
...
Signed-off-by: Paul B Mahol <onemda@gmail.com>
2013-09-13 20:41:12 +00:00
3dcd3e08f6
avcodec/proresdec2: remove duplicated tables
...
Signed-off-by: Paul B Mahol <onemda@gmail.com>
2013-09-13 19:28:10 +00:00
fc477263fa
Merge remote-tracking branch 'qatar/master'
...
* qatar/master:
pcm-dvd: Minor leftovers
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-09-13 13:48:43 +02:00
3c89ec2816
Merge commit 'd9cdb7d8d6d828bb5497ea3f0fd7edd2f3f6cc30'
...
* commit 'd9cdb7d8d6d828bb5497ea3f0fd7edd2f3f6cc30':
pcm-dvd: Support channel configuration changes
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-09-13 13:43:13 +02:00
aca25104ea
pcm-dvd: Minor leftovers
...
Drop a pointless branch in uninit and use the compact copyright.
2013-09-13 12:14:05 +02:00
d9cdb7d8d6
pcm-dvd: Support channel configuration changes
...
The sample buffering logic does not take into account that the blocksize
could change. Reset the buffer if the channel configuration changes,
since if there are leftover samples, it is most likely a broken or
misconcatenated stream. This could lead to negative numbers for
missing_samples during decoding.
Thanks to Michael Niedermeyer for pointing these out.
2013-09-13 12:14:05 +02:00
e2774b3e3b
Merge remote-tracking branch 'cehoyos/master'
...
* cehoyos/master:
Set bits_per_raw_sample when reading j2k frames.
libopenjpegdec.c: Correctly scale gray16 output if precision < 16
Use rc_max_rate if no video bit_rate was specified when muxing mxf_d10.
Store the video bit_rate in the context when muxing mxf.
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-09-12 22:19:46 +02:00
1b99514dfd
avcodec/smacker: use init_get_bits8()
...
Signed-off-by: Paul B Mahol <onemda@gmail.com>
2013-09-12 16:34:54 +00:00
16837f9846
avcodec/aacenc: use enum for aac coder.
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-09-12 17:25:30 +02:00
5748e24950
aacenc: use constants to set AAC coder
...
Signed-off-by: Timothy Gu <timothygu99@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-09-12 17:22:48 +02:00
4bd910d83d
aacenc: add AAC_CODER_(FAAC|ANMR|etc.) macros
...
Signed-off-by: Timothy Gu <timothygu99@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-09-12 17:22:36 +02:00
bfe1445871
avcodec/aic: fix "warning: comparison of unsigned expression < 0 is always false"
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-09-12 17:14:55 +02:00
f144168d9b
avcodec/smacker: fix some memleaks
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-09-12 16:17:32 +02:00
fbab9a7c22
avcodec/smacker: remove check that has become redundant
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-09-12 16:17:32 +02:00
59a08d1939
avcodec/smacker: use the correct field instead of a hardcoded value for the index check in smacker_decode_tree()
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-09-12 16:17:32 +02:00
fa9e8bafc8
Merge commit 'b1e469885362febce3d9a4678624e44a92f77da9'
...
* commit 'b1e469885362febce3d9a4678624e44a92f77da9':
g2meet: Allocate cursor buffers large enough to fit the aligned width
See: 3c4c5ca1c1
2013-09-12 14:48:55 +02:00
72abfba884
Merge commit '0f678c0214dccb355ed8955077a2bea46984fbc8'
...
* commit '0f678c0214dccb355ed8955077a2bea46984fbc8':
aic: Validate values read from the bitstream
Conflicts:
libavcodec/aic.c
See: 657875b145
2013-09-12 14:33:49 +02:00
d6e650d885
Merge commit '0d61f260010707f3028b818e8b24598e1a83d696'
...
* commit '0d61f260010707f3028b818e8b24598e1a83d696':
zmbvdec: Check the buffer size for uncompressed data
Conflicts:
libavcodec/zmbv.c
See: 44c23aa1b8
2013-09-12 13:58:54 +02:00
4caf8c51de
Merge commit 'b26742cc308552f242ee2bf93b07a3ff509f4edc'
...
* commit 'b26742cc308552f242ee2bf93b07a3ff509f4edc':
shorten: Break out of loop looking for fmt chunk if none is found
See: 5e9a56a035
2013-09-12 13:38:52 +02:00
a44d35d90f
Merge commit '49568851bf1700e3d9ea9cda29208d0df3c2c38b'
...
* commit '49568851bf1700e3d9ea9cda29208d0df3c2c38b':
shorten: Use a checked bytestream reader for the wave header
Conflicts:
libavcodec/shorten.c
See: 5e9a56a035
2013-09-12 13:31:59 +02:00
af539319af
Merge commit 'f3d57dc69145f1b7acb4870da9ce60378190a1fd'
...
* commit 'f3d57dc69145f1b7acb4870da9ce60378190a1fd':
smacker: Free memory properly if the init function fails
Conflicts:
libavcodec/smacker.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-09-12 12:57:58 +02:00
f8932d9902
Merge commit '0679cec6e8802643bbe6d5f68ca1110a7d3171da'
...
* commit '0679cec6e8802643bbe6d5f68ca1110a7d3171da':
smacker: Make sure we don't fill in huffman codes out of range
Conflicts:
libavcodec/smacker.c
See: 1285baaab5
2013-09-12 12:51:07 +02:00
d510d70df0
Merge commit 'd002fce24a7206e95f9492031f45adc35711e183'
...
* commit 'd002fce24a7206e95f9492031f45adc35711e183':
smacker: Check malloc return values
Conflicts:
libavcodec/smacker.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-09-12 11:55:08 +02:00
b1e4698853
g2meet: Allocate cursor buffers large enough to fit the aligned width
...
Reported-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
CC: libav-stable@libav.org
Signed-off-by: Martin Storsjö <martin@martin.st>
2013-09-12 10:55:20 +03:00
0f678c0214
aic: Validate values read from the bitstream
...
Reported-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
CC: libav-stable@libav.org
Signed-off-by: Martin Storsjö <martin@martin.st>
2013-09-12 10:54:54 +03:00
0d61f26001
zmbvdec: Check the buffer size for uncompressed data
...
Also don't pointlessly set the buffer size to 1 after copying
one packet.
Reported-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
CC: libav-stable@libav.org
Signed-off-by: Martin Storsjö <martin@martin.st>
2013-09-12 10:53:39 +03:00
b26742cc30
shorten: Break out of loop looking for fmt chunk if none is found
...
Reported-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
CC: libav-stable@libav.org
Signed-off-by: Martin Storsjö <martin@martin.st>
2013-09-12 10:53:04 +03:00
49568851bf
shorten: Use a checked bytestream reader for the wave header
...
Reported-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
CC: libav-stable@libav.org
Signed-off-by: Martin Storsjö <martin@martin.st>
2013-09-12 10:52:42 +03:00
f99f7f4025
Set bits_per_raw_sample when reading j2k frames.
2013-09-12 09:23:32 +02:00
7412a4a48f
libopenjpegdec.c: Correctly scale gray16 output if precision < 16
...
Fixes ticket #2943 .
Signed-off-by: Carl Eugen Hoyos <cehoyos@ag.or.at>
2013-09-12 09:21:51 +02:00
f3d57dc691
smacker: Free memory properly if the init function fails
...
Signed-off-by: Martin Storsjö <martin@martin.st>
2013-09-11 20:20:50 +03:00
0679cec6e8
smacker: Make sure we don't fill in huffman codes out of range
...
Reported-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
CC: libav-stable@libav.org
Signed-off-by: Martin Storsjö <martin@martin.st>
2013-09-11 20:20:45 +03:00
d002fce24a
smacker: Check malloc return values
...
Also try to free local allocations on errors.
Signed-off-by: Martin Storsjö <martin@martin.st>
2013-09-11 20:20:28 +03:00
38155b47fd
avcodec: add const qualifier to avcodec_find_best_pix_fmt2 args
...
avcodec_find_best_pix_fmt2 does not modify its first argument so may be
marked const. This avoids a warning when passing in AVCodec.pix_fmts.
Signed-off-by: Dylan Simon <dylan@dylex.net>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-09-11 16:54:02 +02:00
803445e02c
Merge remote-tracking branch 'qatar/master'
...
* qatar/master:
Drop pointless directory name prefixes from #includes in the current dir
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-09-11 12:51:01 +02:00
64b6279d14
avcodec/mjpegdec: Support >8bpc color mjpeg
...
Fixes Ticket2939
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-09-11 02:45:17 +02:00
7bc9fb8cde
avcodec/utils: add 16bit planar YUV formats to avcodec_align_dimensions2()
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-09-11 02:45:17 +02:00
ae12d65538
lavcodec: Adding support for End Trimming in Opus encoder
...
Adds the end trimming value (duration to be trimmed from the end
of the file due to padding) to the packet's side data. This is
then made use by the muxer to put the value in the container.
Signed-off-by: Vignesh Venkatasubramanian <vigneshv@google.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-09-11 01:03:07 +02:00
889bc79b5f
lavc/utils: Add support for discarding samples from the end
...
Adding support for discarding samples from the end based on the value in
AV_PKT_DATA_SKIP_SAMPLES side data's bytes 5-8.
Signed-off By: Vignesh Venkatasubramanian <vigneshv@google.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-09-10 22:53:21 +02:00
942babd87f
avcodec/vp56: use av_reallocp_array() and check if allocation failed
...
Signed-off-by: Paul B Mahol <onemda@gmail.com>
2013-09-10 15:44:10 +00:00
9b07d34efb
Make avcodec_find_best_pix_fmt_of_list const-correct
...
Signed-off-by: Michael Bradshaw <mjbshaw@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-09-10 12:46:56 +02:00
a0b901a348
Drop pointless directory name prefixes from #includes in the current dir
2013-09-10 12:38:41 +02:00
d1a16564a2
avcodec/ffv1: YUVA(444,422,420) 9, 10 and 16 bit support
...
Signed-off-by: Paul B Mahol <onemda@gmail.com>
2013-09-09 19:49:37 +00:00
a27227d401
avcodec/ffv1dec: fix format detection
...
Fixes crash with carefuly designed files.
Signed-off-by: Paul B Mahol <onemda@gmail.com>
2013-09-09 19:49:01 +00:00
723cf4b29e
Move packed B-frames message level to info.
...
Since they generally decode fine, printing it as a warning
might not really be appropriate.
Signed-off-by: Reimar Döffinger <Reimar.Doeffinger@gmx.de>
2013-09-09 20:51:08 +02:00
4ebf09c346
Make packed B-frame warning message more useful.
...
Signed-off-by: Reimar Döffinger <Reimar.Doeffinger@gmx.de>
2013-09-09 20:51:08 +02:00
3576b564ec
avcodec/ffv1enc: encode slice as raw PCM in 1.4 when the buffer is too small.
...
This limits the maximum size of encoded slices more tightly
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-09-09 20:20:21 +02:00
8393b80b7d
avcodec/ffv1dec: Support decoding planes as raw PCM in 1.4
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-09-09 20:19:28 +02:00
77f521d9e5
avcodec/ffv1enc: check encode_line()s return code
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-09-09 20:19:24 +02:00
3728603f18
avcodec/ffv1enc: update buffer check for 16bps
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-09-09 20:19:17 +02:00
904a2864bd
avcodec/ffv1enc: fix size used for ff_alloc_packet2()
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-09-09 20:19:08 +02:00
9a0e20817a
avcodec/util: Make size argument of ff_alloc_packet2() int64_t
...
This ensures that huge sizes dont get truncated before the check in ff_alloc_packet2()
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-09-09 20:18:54 +02:00
a5615b82eb
avcodec/eatgv: use av_reallocp_array() and check return value
...
Fixes #2949 .
Signed-off-by: Paul B Mahol <onemda@gmail.com>
2013-09-09 12:26:05 +00:00
5e66d8ac63
avcodec/xwdenc: use AV_LOG_ERROR in error message
...
Signed-off-by: Paul B Mahol <onemda@gmail.com>
2013-09-09 11:58:12 +00:00
9bc59c108b
avcodec/bmpenc: return meaningful error code
...
Signed-off-by: Paul B Mahol <onemda@gmail.com>
2013-09-09 11:58:11 +00:00
6e07bb3639
avcodec/truemotion2: use av_reallocp_array() and check return value
...
Also reset tok_lens if reallocation fails.
Fixes #2946 .
Signed-off-by: Paul B Mahol <onemda@gmail.com>
2013-09-09 11:53:38 +00:00
7d75fb381b
h264: do not discard NAL_SEI when skipping frames
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-09-09 11:42:26 +02:00
b4e1630d4d
lavc: don't show "Invalid and inefficient vfw-avi..." warning in mpeg4 parser
...
Only the actual decoder should print this warning.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-09-09 03:14:53 +02:00
ce22820627
avcodec/mjpegdec: fix shift_output() with lowres
...
Fixes Ticket2940
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-09-09 01:46:14 +02:00
7caaa72e62
Merge remote-tracking branch 'cehoyos/master'
...
* cehoyos/master:
libxvid: guess a good aspect when we cant store the exact one.
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-09-08 23:49:33 +02:00
43497d8a83
avcodec/proresdec2: return meaningful error codes
...
Signed-off-by: Paul B Mahol <onemda@gmail.com>
2013-09-08 21:44:32 +00:00
d8fb170da2
avcodec/ratecontrol: give some trivial tips in case of buffer underflows
...
See Ticket2725
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-09-08 23:11:39 +02:00
43353bf32c
libxvid: guess a good aspect when we cant store the exact one.
...
Based on 394781a8
2013-09-08 22:53:14 +02:00
cd6241b5df
avcodec/truemotion2: use av_calloc() & av_malloc_array()
...
Signed-off-by: Paul B Mahol <onemda@gmail.com>
2013-09-08 18:56:06 +00:00
c54aa2fb0f
avcodec/truemotion2: Fix av_freep arguments
...
Fixes null pointer dereference
Fixes Ticket2944
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-09-08 20:27:54 +02:00
3a54c221d5
avcodec/srtdec: fix potential overread.
2013-09-08 18:50:25 +02:00
860a081058
avcodec/assenc: fix potential overread.
2013-09-08 18:50:25 +02:00
7d7b4e8d5c
avcodec/png: remove obsolete comments
...
Signed-off-by: Paul B Mahol <onemda@gmail.com>
2013-09-08 15:13:33 +00:00
58e5f6a433
oMerge commit '85ac12587bfef970d0e0e4abc292df346daf8478'
...
* commit '85ac12587bfef970d0e0e4abc292df346daf8478':
nuv: check ff_rtjpeg_decode_frame_yuv420 return value
Conflicts:
libavcodec/nuv.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-09-08 11:40:45 +02:00
ea538b0d64
avcodec/snowenc: fix constness of the AVFrame argument in encode_frame()
...
Some fields of the frame are changed to reflect encoder decissions like
if its a keyframe. It thus cannot be constant.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-09-08 05:22:45 +02:00
85ac12587b
nuv: check ff_rtjpeg_decode_frame_yuv420 return value
...
CC: libav-stable@libav.org
2013-09-07 11:11:52 +02:00
c9b5ad124e
s302m: s/bits_per_coded_sample/bits_per_raw_sample
...
bits_per_coded_sample should be set from demuxer and
not from decoder.
Signed-off-by: Paul B Mahol <onemda@gmail.com>
2013-09-06 17:43:35 +00:00
6b024d8a7a
avcodec/xan: use uint8_t instead of unsigned char
...
Signed-off-by: Paul B Mahol <onemda@gmail.com>
2013-09-06 17:18:17 +00:00
2a27e52550
Merge commit '7f93a861aaf2e76fd63b53ccc465909873b8dc29'
...
* commit '7f93a861aaf2e76fd63b53ccc465909873b8dc29':
mpeg12enc: K&R formatting cosmetics
Conflicts:
libavcodec/mpeg12enc.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-09-06 13:00:47 +02:00
61845dc74a
Merge commit '66f091053f11a8957b2175480d2f368d2cf4474c'
...
* commit '66f091053f11a8957b2175480d2f368d2cf4474c':
mpeg12enc: drop forward declarations
Conflicts:
libavcodec/mpeg12enc.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-09-06 12:34:09 +02:00
bcd1c20612
avcodec/mjpegdec: support >8bit in mjpeg_decode_scan_progressive_ac()
...
Fixes Ticket2812
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-09-06 02:33:10 +02:00
b155fb08b8
avcodec/mjpegdec: move shift_output() to its own function
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-09-06 02:31:32 +02:00
c407c73457
avcodec/mjpegdec: 12bit Grayscale support
...
Fixes part of Ticket2812
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-09-06 01:19:37 +02:00
1deeb9437c
avcodec/mjpegdec: Fix normal jpeg with bits < 8
...
Untested due to lack of testcase
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-09-06 01:19:37 +02:00
15071ed4fc
avcodec/mjpegdec fix last_dc for bits != 8
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-09-06 01:19:37 +02:00
Michael Niedermayer
Martin Storsjö
Alex Converse
Justin Ruggles
John Stebbins
Derek Buitenhuis
Vittorio Giovara
Clément Bœsch
Hendrik Leppkes
Piotr Bandurski
Paul B Mahol
Christian Schmidt
Timothy Gu
Carl Eugen Hoyos
Michael Bradshaw
Dylan Alex Simon
Vignesh Venkatasubramanian
Diego Biurrun
Reimar Döffinger
Rainer Hochecker
wm4
Luca Barbato