OSDN Git Service
Chih-Wei Huang [Sun, 3 Nov 2013 16:06:07 +0000 (00:06 +0800)]
libavutil: fix av_err2str compiling error for C++
The implementation may not be thread-safe. But good enough for us.
Chih-Wei Huang [Sat, 2 Nov 2013 16:08:04 +0000 (00:08 +0800)]
Android porting for ffmpeg 2.1 release
Add Android.mk to build ffmpeg libraries with AOSP tree.
Based on the nice work of Chia-I Wu (olv):
git://gitorious.org/~olvaffe/ffmpeg/ffmpeg-android
Tested built OK on Android 4.3 for x86, mips, armv7-a and armv7-a-neon.
Michael Niedermayer [Wed, 15 Jan 2014 17:29:16 +0000 (18:29 +0100)]
Update for 2.1.3
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Thu, 28 Nov 2013 20:52:46 +0000 (21:52 +0100)]
library.mak: only run asm strip if ASMSTRIP flags are set
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
(cherry picked from commit
e975c147e18010a9f96f56b21d0cd0f026eaae0e)
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Thu, 28 Nov 2013 20:35:12 +0000 (21:35 +0100)]
configure: remove code that disables striping in the absence of some flags
This prevents breaking (non asm) striping in that case
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
(cherry picked from commit
191454f26e5a2f5026fef9a25df6d61c2a06615c)
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Thu, 28 Nov 2013 20:29:13 +0000 (21:29 +0100)]
build sys: rename STRIPFLAGS to ASMSTRIPFLAGS
This more closely matches the actual use, also we use plain
strip without these flags for striping
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
(cherry picked from commit
e283c26c35c4f18c8eb2e79183037a883b12d1e5)
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Thu, 28 Nov 2013 20:27:05 +0000 (21:27 +0100)]
Merge commit '
0673ede985a6560e7efb86dab1c58fb7f95ce587'
* commit '
0673ede985a6560e7efb86dab1c58fb7f95ce587':
configure: add strip flags checks
Merged-by: Michael Niedermayer <michaelni@gmx.at>
(cherry picked from commit
71b95f2ab603ea607bc1b930fcfc3974b40ba484)
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Mon, 13 Jan 2014 21:17:12 +0000 (22:17 +0100)]
avformat/utils/av_probe_input_buffer2: fix buffer passed to ffio_rewind_with_probe_data()
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
(cherry picked from commit
05886c9d4edddb07a4cdc6afee8b30cd9c80b4db)
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Mon, 13 Jan 2014 21:17:12 +0000 (22:17 +0100)]
avformat/utils/av_probe_input_buffer2: fix offset check
The check could fail if avio_read() read less than requested
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
(cherry picked from commit
8c3b026a0eeb49464d957b61b0c01cceecc416fd)
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Mon, 13 Jan 2014 21:14:02 +0000 (22:14 +0100)]
avformat/utils/av_probe_input_buffer2: Fix pd.buf_size
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
(cherry picked from commit
6a2064820b52568c05a9ec8f418f18840e7c43cc)
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Clément Bœsch [Mon, 18 Nov 2013 07:08:41 +0000 (08:08 +0100)]
avcodec/libxavs: 2nd attempt to fix compilation after
b18c7c8d.
(cherry picked from commit
260fc0d95b025b03b2a15116526e4c83b1ca1a31)
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Clément Bœsch [Mon, 18 Nov 2013 06:53:08 +0000 (07:53 +0100)]
avcodec/libxavs: attempt to fix compilation after
b18c7c8d.
(cherry picked from commit
71cd83e34cf7ba88d766434e3d2b4d99c14bf0f2)
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Mon, 13 Jan 2014 16:21:42 +0000 (17:21 +0100)]
Update for 2.1.2
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Carl Eugen Hoyos [Thu, 31 Oct 2013 19:17:18 +0000 (20:17 +0100)]
Fix a crash on oom when decoding hevc.
(cherry picked from commit
5ab1efb9d0dc65e748a0291b67915e35578b302e)
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Mon, 13 Jan 2014 02:51:39 +0000 (03:51 +0100)]
avcodec/hevc: Check entry point arrays for malloc failure
Fixes null pointer dereference
Fixes: signal_sigsegv_e1d3b6_2192_DBLK_F_VIXS_2.bit
Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
(cherry picked from commit
22bfb4be284c12f33b9dac010713fe3ca6d974bf)
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Luca Barbato [Sun, 12 Jan 2014 00:14:12 +0000 (01:14 +0100)]
hevc: Bound check slice_qp
The T-REC-H.265-
2013044 page 79 states they have to be into the range
[-s->sps->qp_bd_offset, 51].
Fixes: asan_stack-oob_eae8e3_9522_WP_MAIN10_B_Toshiba_3.bit
Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
(cherry picked from commit
aead772b5814142b0e530804486ff7970ecd9eef)
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Luca Barbato [Sat, 11 Jan 2014 15:52:43 +0000 (16:52 +0100)]
hevc: Reject impossible dependent tile
The tile 0 cannot depend on a previous one.
Prevent an out of array bound load in ff_hevc_cabac_init().
Fixes: asan_heap-oob_e3a924_1630_DBLK_A_MAIN10_VIXS_2.bit
Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Reviewed-by: Guillaume Martres <smarter@ubuntu.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
(cherry picked from commit
48a5b155433ed7af20fb0a5c20ca131958727727)
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Guillaume Martres [Sat, 11 Jan 2014 21:46:25 +0000 (22:46 +0100)]
hevc: remove useless clip in FUNC(sao_band_filter)()
The src buffer should only contain values in the interval
[0, (1 << BIT_DEPTH) - 1]. Since shift = (BIT_DEPTH - 5), src[x] >> shift
must be in the interval [0, 31], so no clip is needed.
This removes the code that was changed in
5856bca360c5bc3e340a357d91b1f993c80a7bea
as the clip that was repositioned in that commit is removed
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
(cherry picked from commit
b00a8b4d194f1bf23343f3f42138affa1fe26641)
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Guillaume Martres [Sat, 11 Jan 2014 21:46:24 +0000 (22:46 +0100)]
hevc: clip pixels when transquant bypass is used
Fixes: asan_stack-oob_eae8e3_7333_WPP_B_ericsson_MAIN10_2.bit
Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
This is a more proper fix than
5856bca360c5bc3e340a357d91b1f993c80a7bea
The reconstructed picture should always be clipped (see section 8.6.5),
previously we did not clip coding units where
cu_transquant_bypass_flag == 1
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
(cherry picked from commit
c9fe0caf7a1abde7ca0b1a359f551103064867b1)
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Luca Barbato [Sat, 11 Jan 2014 15:52:41 +0000 (16:52 +0100)]
hevc: Clip the pixel before shifting
Prevent an out of array bound read.
Fixes: asan_stack-oob_eae8e3_7333_WPP_B_ericsson_MAIN10_2.bit
Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
(cherry picked from commit
5856bca360c5bc3e340a357d91b1f993c80a7bea)
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Sat, 11 Jan 2014 19:23:51 +0000 (20:23 +0100)]
avcodec/hevc: use av_mallocz() for allocating tab_ipm
Fixes use of uninitialized memory and out of stack array read
Fixes: signal_sigsegv_ecc526_7846_WPP_C_ericsson_MAIN_2.bit
Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
(cherry picked from commit
0999f1613bc48ed9d6578a3ad7bcd17610e07fbf)
Conflicts:
libavcodec/hevc.c
Michael Niedermayer [Sat, 11 Jan 2014 03:36:15 +0000 (04:36 +0100)]
avcodec/alac: only set *got_frame_ptr when all channels have been decoded
Fixes use of uninitialized memory
Fixes: msan_uninit-mem_7f8b64436530_7895_quicktime_newcodec_applelosslessaudiocodec.m4a
Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
(cherry picked from commit
e11983bda073f8c63f60509ee753da9fba20ed10)
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Clément Bœsch [Fri, 10 Jan 2014 00:51:22 +0000 (01:51 +0100)]
avformat/pjsdec: dont increase pointer when its already at the end in read_ts()
Fixes use of uninitialized memory
Fixes: msan_uninit-mem_7f91f2de7764_2649_PJS_capability_tester.pjs
Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
(cherry picked from commit
b84a7330af41cec93384bf59ed68c67b09d105cd)
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Sat, 11 Jan 2014 01:04:01 +0000 (02:04 +0100)]
avcodec/wmalosslessdec: shrink output on error so no uninitialized data is returned
Fixes use of uninitialized memory
partly fixes: msan_uninit-mem_7f7834b6a530_6473_luckynight-partial.wma
Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
(cherry picked from commit
6b18a6839b43ea78e70cd3e35f781d1c955bda73)
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Sat, 11 Jan 2014 00:59:20 +0000 (01:59 +0100)]
avcodec/wmalosslessdec: deallocate uninitialized frame on decode_tilehdr() failure
Fixes use of uninitialized memory
partly fixes: msan_uninit-mem_7f7834b6a530_6473_luckynight-partial.wma
Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
(cherry picked from commit
ae3856dcaf9c5ef339969c95a72bcaf7c4bba9ec)
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Sat, 11 Jan 2014 00:58:36 +0000 (01:58 +0100)]
avcodec/wmalosslessdec: Pass on error code from decode_tilehdr()
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
(cherry picked from commit
03fff09b32171e0c76d104c02ebf578c7f4fe21d)
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Fri, 10 Jan 2014 22:10:47 +0000 (23:10 +0100)]
avformat/matroskadec: check generic audio deinterleaver sub_packet_size against frame_size
Fixes use of uninitialized memory
Fixes: msan_uninit-mem_7f67d052a530_7517_nosound.mkv
Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
(cherry picked from commit
a1ed1c2193483849df689b105bec0d26c2497999)
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Fri, 10 Jan 2014 19:58:19 +0000 (20:58 +0100)]
avformat/flvdec: initialize context before reading from it
Fixes use of uninitialized memory
Fixes: msan_uninit-mem_7f9b8387069e_5377_flv_with_pcm_s16be_audio_track.flv
Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
(cherry picked from commit
396ddcf22d55fa7e735d69eed22a4a4b1649b73c)
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Fri, 10 Jan 2014 01:11:20 +0000 (02:11 +0100)]
avformat/mxfdec: check avio_read(UID) result
Fixes use of uninitialized memory
Fixes: msan_uninit-mem_7fc9ba2fd98e_82_02785736.mxf
Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
(cherry picked from commit
4162ceea93684f3cd656dc21d30903e102a44e73)
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Thu, 9 Jan 2014 21:59:51 +0000 (22:59 +0100)]
avformat/rmdec: when reading audio blocks, dont leave holes when reading fails
The fate test is changed because the reference file depends on the use of
non cleared data at the very
end. Alternatively we could upload a new reference file, though that would
then have to be changed every time the handling of a truncated frame changes
or theres a change to error concealment, each time adding a new file ...
Fixes use of uninitialized memory
Fixed: msan_uninit-mem_7f3c02b81363_2787_RLG2_19.rm
Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
(cherry picked from commit
77d2a1ca595ebe082d35c4b624ac9a9145991494)
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Tue, 10 Dec 2013 22:41:50 +0000 (23:41 +0100)]
avcodec/h264: fix code that blindly dereferences NULL DPB
Fixes mixed flushing and decoding NULL packets
Found-by: wm4
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
(cherry picked from commit
d9339ab55373b12f078a3e3f1e294d8ff78652dd)
Conflicts:
libavcodec/h264.c
Hendrik Leppkes [Fri, 10 Jan 2014 19:18:08 +0000 (20:18 +0100)]
vdpau: restore compatibility with deprecated fields in AVVDPAUContext
Fixes ticket #3133.
Signed-off-by: Hendrik Leppkes <h.leppkes@gmail.com>
Tested-by: EricV
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
(cherry picked from commit
23bc1351ad7db698da9348e23ee63ec7300a881d)
Carl Eugen Hoyos [Fri, 10 Jan 2014 09:57:43 +0000 (10:57 +0100)]
Fix libopenjpeg colour range adjust for 8<bpp<16.
Fixes ticket #3284.
Reviewed-by: Michael Bradshaw
(cherry picked from commit
8298b54179c92fc3293ea312c4fcf153917bca0a)
Michael Niedermayer [Thu, 9 Jan 2014 03:02:58 +0000 (04:02 +0100)]
avcodec/msvideo1enc: fix SKIPS_MAX
Fixes Ticket3270
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
(cherry picked from commit
fb8f5d0510619cea2204246631f1c0dcd994ee25)
Carl Eugen Hoyos [Tue, 7 Jan 2014 21:49:05 +0000 (22:49 +0100)]
Use the h264 parser when decoding VSSH in avi.
Fixes ticket #3261 visually.
Analyzed-by: Michael Doilnitsyn
(cherry picked from commit
94cf4f8bac12c58e30ce3b5d72cf5898baafe9a8)
Michael Niedermayer [Wed, 8 Jan 2014 03:49:50 +0000 (04:49 +0100)]
avformat/mxfdec: detect loops during header parsing
The header parser uses forward and backward parsing, making the
bulletproof prevention of loops difficult, thus this simple
detection code.
If someone improves the forward/backward parsing so it cannot loop
then this commit should be reverted
Fixes Ticket3278
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
(cherry picked from commit
1c010fd035c1a14dc73827b84f21f593e969a5d6)
Michael Niedermayer [Fri, 22 Nov 2013 19:09:03 +0000 (20:09 +0100)]
avformat/mov: Check that we have a stream before accessing it in mov_read_ares()
Fixes out of array read
Fixes: signal_sigsegv_6f1855_3910_avid_test_alpha.mov
Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
(cherry picked from commit
a7f27453f64d9020b92b01687baeb5909c6cdad0)
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Fri, 22 Nov 2013 18:47:34 +0000 (19:47 +0100)]
avformat/ipmovie: check OPCODE_INIT_VIDEO_BUFFERS size more completely
Fixes use of uninitialized data
Fixes: signal_sigsegv_1571228_5930_ipmovie_interplayvideo_interplay_dpcm__bislogo.mve
Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
(cherry picked from commit
2e97e244097c309571b383dd107252404ebb3326)
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Fri, 22 Nov 2013 15:51:07 +0000 (16:51 +0100)]
avcodec/mjpegdec: check len in mjpeg_decode_app() more completely
Avoids len from becoming negative and causing assertion failure
Fixes: signal_sigabrt_7ffff7126425_5140_fd44dc63fa7bdd12ee34fc602231ef02.jpg
Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
(cherry picked from commit
6060234d43dcf0b5200cdd7dbd2f1542146827eb)
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Fri, 22 Nov 2013 14:08:04 +0000 (15:08 +0100)]
avformat/avidec: Dont assert the existence of an index for video streams.
Its possible in various rare cases that an index cannot be created or allocated.
Fixes assertion failure
Fixes: signal_sigabrt_7ffff7126425_7712_pokem.avi
Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
(cherry picked from commit
7865759409b27089b444bc029b2b76b06161b2cf)
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Tue, 31 Dec 2013 14:18:47 +0000 (15:18 +0100)]
avcodec/hevc: clear HEVClc when its deallocated in hevc_decode_free()
Fixes reading freed memory
Fixes: asan_heap-uaf_1abf8ef_3987_NUT_A_ericsson_4.bit
Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
(cherry picked from commit
21a2fb7e0579703fdea96f659498ef8b1f243289)
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Wed, 27 Nov 2013 16:04:05 +0000 (17:04 +0100)]
avutil/log: check that len is within the buffer before reading it
Fixes out of array read
Fixes: asan_heap-oob_19d6979_6857_mmw_deadzy.ogg
Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
(cherry picked from commit
808c10e728db2d92ccbb0f8b3bcd4a2f4305a2cf)
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Tue, 26 Nov 2013 20:53:47 +0000 (21:53 +0100)]
avcodec/g2meet: check available space before copying palette
Fixes out of array read
Fixes: asan_heap-uaf_ae6067_5415_g2m4.wmv
Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
(cherry picked from commit
6d9dad6a7cb5d544d540abf941fedbd34c14d2bd)
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Mon, 25 Nov 2013 22:16:17 +0000 (23:16 +0100)]
avcodec/ac3dec: check bap before use.
Fixes out of array read
Fixes assertion failure
Fixes asan_static-oob_16431c0_8036_rio_bravo_mono_64_spx.ac3
Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
(cherry picked from commit
4782c4284fa3856a9b6910fe5ff6e4fb1c65b58c)
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Mon, 25 Nov 2013 18:45:43 +0000 (19:45 +0100)]
Revert "Merge remote-tracking branch 'qatar/master'" (
43dec5ef9a360c9ffac3278f464832bd99af0cb0)
Fixes out of array accesses
Fixes asan_static-oob_eb9812_5961_iv41.avi
This reverts the merge of
c9ef6b09326a24010bf86d6b0d19cfa42df4d546
Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
(cherry picked from commit
c3d5cd1ebfba8fe36a0da7fad47df7fdf9c4ccd0)
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Mon, 6 Jan 2014 01:51:20 +0000 (02:51 +0100)]
avcodec/hevc: Fix modulo operations
Fixes qp fields becoming out of range
Fixes: asan_static-oob_e393a3_6998_WPP_A_ericsson_MAIN10_2.bit
Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
(cherry picked from commit
4ced5d7780fea2ea49444d6686d26f26b3a2160f)
Conflicts:
libavcodec/hevc_filter.c
Michael Niedermayer [Mon, 6 Jan 2014 01:51:20 +0000 (02:51 +0100)]
avcodec/hevc_ps: check that VPS referenced from SPS exists
This matches how its done for SPS/PPS.
An alternative to this is to check it when its used.
Fixes null pointer dereference
Fixes: signal_sigsegv_e30a43_1437_CIP_A_Panasonic_3.bit
Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
(cherry picked from commit
d66bab0a69ac1860e78dd951ad8db1a507e75642)
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Nicolas George [Sun, 29 Dec 2013 09:54:32 +0000 (10:54 +0100)]
lavc/mjpegenc: use proper error codes.
(cherry picked from commit
2ebaadf35c9387610ca1eb7e94c171050562a77c)
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Nicolas George [Sun, 29 Dec 2013 09:52:19 +0000 (10:52 +0100)]
lavc/mjpegenc: check av_frame_alloc() failure.
(cherry picked from commit
19a2d101acc0260bb310e79010a8491b10716189)
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Nicolas George [Sun, 29 Dec 2013 09:50:24 +0000 (10:50 +0100)]
lavc/libopenjpegenc: check av_frame_alloc() failure.
(cherry picked from commit
97af2faaba70c866ae4c11459a79a16d4a014530)
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Nicolas George [Sun, 29 Dec 2013 09:49:01 +0000 (10:49 +0100)]
lavc/diracdec: check av_frame_alloc() failure.
(cherry picked from commit
a91394f4de63ae5c2e21c548045b79393ca7fea1)
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Nicolas George [Sun, 29 Dec 2013 09:42:54 +0000 (10:42 +0100)]
lavc/utils: check av_frame_alloc() failure.
(cherry picked from commit
38004051b53ddecb518053e6dadafa9adc4fc1b2)
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Nicolas George [Sun, 29 Dec 2013 09:37:58 +0000 (10:37 +0100)]
ffprobe: check av_frame_alloc() failure.
(cherry picked from commit
a55692a96099c40aabb25e1443890be99f9c845c)
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Nicolas George [Sun, 29 Dec 2013 09:33:27 +0000 (10:33 +0100)]
lavc/ffwavesynth: fix dependency sizeof(AVFrame).
(cherry picked from commit
bcfcb8b8524dfcc1c37d520ccf3fba3b3a4c104d)
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Wed, 25 Dec 2013 17:32:03 +0000 (18:32 +0100)]
ffprobe: Dont clear AVFrame between uses.
The old API required this clearing in the past, the new API does not
require it.
Fixes memleak
Regression introduced by
37a749012aaacc801fe860428417a6d7b81c103f
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
(cherry picked from commit
565f786d1da1fea80fcea231550d5d0f174c009a)
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Tue, 17 Dec 2013 15:27:36 +0000 (16:27 +0100)]
avcodec/utils: drop 2 dependancies on sizeof(AVFrame)
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
(cherry picked from commit
c90f31146e8b1407a4a5808d0d904d85baeed5d4)
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Tue, 17 Dec 2013 15:27:36 +0000 (16:27 +0100)]
avcodec/libvorbisenc: drop dependancy on sizeof(AVFrame)
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
(cherry picked from commit
3c8b085764ed4b036df4a8908a0781dc6d73ee11)
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Tue, 17 Dec 2013 15:27:36 +0000 (16:27 +0100)]
ffprobe: drop dependancy on sizeof(AVFrame)
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
(cherry picked from commit
bf1c87ee7ab1b98c1b92172eb1ebd6ad55564ff7)
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Tue, 17 Dec 2013 15:27:36 +0000 (16:27 +0100)]
avcodec/flashsv2enc: drop dependancy on sizeof(AVFrame)
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
(cherry picked from commit
b8f4410ff60b3a973cd13351d00a1d88eaddfb71)
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Tue, 17 Dec 2013 15:27:36 +0000 (16:27 +0100)]
avcodec/j2kenc: drop dependancy on sizeof(AVFrame)
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
(cherry picked from commit
8443b27072a076abb28d7f2f60bc90e1d5c285df)
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Tue, 17 Dec 2013 15:27:36 +0000 (16:27 +0100)]
avcodec/libopenjpegenc: drop dependancy on sizeof(AVFrame)
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
(cherry picked from commit
1458f0647ca0c882cc1c29892ac130a1056a1f47)
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Tue, 17 Dec 2013 15:27:36 +0000 (16:27 +0100)]
avcodec/mjpegenc: drop dependancy on sizeof(AVFrame)
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
(cherry picked from commit
5b3f4b3ef590b1221d44d24345a846c1aa636b69)
Conflicts:
libavcodec/mjpegenc.c
Michael Niedermayer [Tue, 17 Dec 2013 15:27:36 +0000 (16:27 +0100)]
avcodec/msvideo1enc: drop dependancy on sizeof(AVFrame)
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
(cherry picked from commit
c81234651f761a44a3e72829fd494211e237069c)
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Tue, 17 Dec 2013 14:30:20 +0000 (15:30 +0100)]
avcodec/diracdec: avoid depending on sizeof(AVFrame)
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
(cherry picked from commit
fca7943850ecdc1e67a0275b488768be01867f75)
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Tue, 17 Dec 2013 13:03:38 +0000 (14:03 +0100)]
avcodec/utils: implement avcodec_alloc_frame() through av_alloc_frame()
This ensures that theres just one AVFrame allocation function and libs dont
produce multiple AVFrame variants after a minor lib update
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
(cherry picked from commit
5abdda214df53f009434f19b9eb8e1375f2924d9)
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Mon, 9 Dec 2013 23:50:09 +0000 (00:50 +0100)]
avcodec/libutvideodec: use av_frame_move_ref()
AVFrames cannot be copied literally, their definition is in
avutil and their extended_data can point to their data[]
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
(cherry picked from commit
4c1b4ae1baf77df7150fa8cbcece8057a261e47d)
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Mon, 9 Dec 2013 19:06:39 +0000 (20:06 +0100)]
Merge commit '
d4f1188d1a662fed5347e70016da49e01563e8a8'
* commit '
d4f1188d1a662fed5347e70016da49e01563e8a8':
dv: use AVFrame API properly
Conflicts:
libavcodec/dvdec.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
(cherry picked from commit
94a849b8b6c3e4a90361485b2e12a9a5c35833a3)
Conflicts:
libavcodec/dv.h
libavcodec/dvdec.c
libavcodec/dvenc.c
Author of the merged code: Anton Khirnov
Michael Niedermayer [Mon, 9 Dec 2013 12:19:50 +0000 (13:19 +0100)]
Merge commit '
d351ef47d0e0ccb7de96b37f137c16b2885580ac'
* commit '
d351ef47d0e0ccb7de96b37f137c16b2885580ac':
pthread_frame: use the AVFrame API properly.
Conflicts:
libavcodec/pthread_frame.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
(cherry picked from commit
45fd4ec9ef2b3a7074c49cdddac6e7dcc127a874)
Conflicts:
libavcodec/pthread_frame.c
Author of the merged code: Anton Khirnov
Michael Niedermayer [Mon, 9 Dec 2013 12:02:16 +0000 (13:02 +0100)]
Merge commit '
b605b123ef1d3bac0e7c221d8d7fa74cd8c7253c'
* commit '
b605b123ef1d3bac0e7c221d8d7fa74cd8c7253c':
mxpegdec: use the AVFrame API properly.
Merged-by: Michael Niedermayer <michaelni@gmx.at>
(cherry picked from commit
8947f47fdfaf7f3a907a334fc65dc724f2fdd23f)
Author of the merged code: Anton Khirnov
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Mon, 9 Dec 2013 11:54:59 +0000 (12:54 +0100)]
Merge commit '
afa21a12bf084f905187615706b0a8d92bc98661'
* commit '
afa21a12bf084f905187615706b0a8d92bc98661':
p*menc: use the AVFrame API properly.
Conflicts:
libavcodec/Makefile
libavcodec/pamenc.c
libavcodec/pnmenc.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
(cherry picked from commit
37945584bfb29f187e38531c90bb02a32014e48d)
Author of the merged code: Anton Khirnov
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
anatoly [Sun, 27 Mar 2011 20:16:25 +0000 (22:16 +0200)]
Add support for picture_ptr field in MJpegDecodeContext
Signed-off-by: Anton Khirnov <anton@khirnov.net>
(cherry picked from commit
e0e3b8b297bae5144f23fd4b46a1309857040b63)
Conflicts:
libavcodec/jpeglsdec.c
libavcodec/mjpegbdec.c
libavcodec/mjpegdec.c
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
(cherry picked from commit
2fade10cb0c53e6b2a663d8ce0566ba7c61013cf)
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Mon, 9 Dec 2013 11:32:37 +0000 (12:32 +0100)]
Merge commit '
e2274aa555f023e4f4e4819bf29b2d7e0adec7d5'
* commit '
e2274aa555f023e4f4e4819bf29b2d7e0adec7d5':
mjpegdec: use the AVFrame API properly.
Conflicts:
libavcodec/mjpegdec.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
(cherry picked from commit
639303867640d1880fad675472bc47e9c95f96c7)
Author of the merged code: Anton Khirnov
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Sun, 17 Nov 2013 12:27:46 +0000 (13:27 +0100)]
Merge remote-tracking branch 'qatar/master'
* qatar/master:
mpegvideo_enc: use the AVFrame API properly.
ffv1: use the AVFrame API properly.
jpegls: use the AVFrame API properly.
huffyuv: use the AVFrame API properly.
Conflicts:
libavcodec/ffv1.c
libavcodec/ffv1.h
libavcodec/ffv1dec.c
libavcodec/ffv1enc.c
Changes to ffv1 are more redone than merged due to them being based on
an ancient codebase and a good part of that having being done already
as well.
Merged-by: Michael Niedermayer <michaelni@gmx.at>
(cherry picked from commit
be1e6e7503b2f10b0176201418eb97912cee093f)
Conflicts:
libavcodec/ffv1enc.c
libavcodec/mpegvideo.h
libavcodec/mpegvideo_enc.c
Author of the merged code: Anton Khirnov
Michael Niedermayer [Sun, 17 Nov 2013 02:31:32 +0000 (03:31 +0100)]
Merge commit '
d48c20630214a4effcc920e93a5044bee4e2002e'
* commit '
d48c20630214a4effcc920e93a5044bee4e2002e':
qtrleenc: use the AVFrame API properly.
ulti: use the AVFrame API properly.
vc1: use the AVFrame API properly.
flashsv: use the AVFrame API properly.
Conflicts:
libavcodec/flashsv.c
libavcodec/qtrleenc.c
libavcodec/ulti.c
libavcodec/vc1dec.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
(cherry picked from commit
92cbd775687204f9750a09c69f97702719036aab)
Conflicts:
libavcodec/flashsv.c
Author of the merged code: Anton Khirnov
Michael Niedermayer [Sun, 17 Nov 2013 11:41:42 +0000 (12:41 +0100)]
Merge commit '
ffe04c330335add4c6d70ab0bb98e6b3f4f7abfa'
* commit '
ffe04c330335add4c6d70ab0bb98e6b3f4f7abfa':
libxvid: use the AVFrame API properly.
pcxenc: use the AVFrame API properly.
roqvideo: remove unused variables
libschroedingerenc: use the AVFrame API properly.
Conflicts:
libavcodec/pcxenc.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
(cherry picked from commit
f4f7888bab7061f08c54356c285adaba24383dc0)
Author of the merged code: Anton Khirnov
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Sun, 17 Nov 2013 11:33:27 +0000 (12:33 +0100)]
Merge commit '
97168b204a0b6b79bb6c5f0d40efdf7fc2262476'
* commit '
97168b204a0b6b79bb6c5f0d40efdf7fc2262476':
eatgv: use the AVFrame API properly.
libxavs: use the AVFrame API properly.
nuv: use the AVFrame API properly.
flashsvenc: use the AVFrame API properly.
Conflicts:
libavcodec/eatgv.c
libavcodec/nuv.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
(cherry picked from commit
a0c0629dd963b00f989172f0c599353b6b288c37)
Conflicts:
libavcodec/eatgv.c
Author of the merged code: Anton Khirnov
Michael Niedermayer [Sun, 17 Nov 2013 11:17:05 +0000 (12:17 +0100)]
Merge commit '
57e7b3a89f5a0879ad039e8f04273b48649799a8'
* commit '
57e7b3a89f5a0879ad039e8f04273b48649799a8':
dnxhdenc: use the AVFrame API properly.
libx264: use the AVFrame API properly.
svq1enc: use the AVFrame API properly.
gif: use the AVFrame API properly.
Conflicts:
libavcodec/gif.c
libavcodec/svq1enc.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
(cherry picked from commit
5b0c70c2499e20529d517b712910d6f4f72e9485)
Author of the merged code: Anton Khirnov
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Sun, 17 Nov 2013 11:02:09 +0000 (12:02 +0100)]
Merge commit '
45bde93eefa78c1bdb0936109fbd2e2fb27fbfe7'
* commit '
45bde93eefa78c1bdb0936109fbd2e2fb27fbfe7':
sunrastenc: use the AVFrame API properly.
targaenc: use the AVFrame API properly.
tiffenc: use the AVFrame API properly.
pngenc: use the AVFrame API properly.
Conflicts:
libavcodec/pngenc.c
libavcodec/sunrastenc.c
libavcodec/targaenc.c
libavcodec/tiffenc.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
(cherry picked from commit
3ea168edeb7a20eae1fccf7da66ac7b8c8c791ba)
Author of the merged code: Anton Khirnov
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Sun, 17 Nov 2013 10:41:26 +0000 (11:41 +0100)]
Merge commit '
0ea430c75b8d90449d2878ad84669a2da2ad3cbc'
* commit '
0ea430c75b8d90449d2878ad84669a2da2ad3cbc':
lclenc: use the AVFrame API properly.
Conflicts:
libavcodec/lclenc.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
(cherry picked from commit
85b7b0c519f8d9491b4c0340329a605cc97c8984)
Author of the merged code: Anton Khirnov
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Sun, 17 Nov 2013 02:17:00 +0000 (03:17 +0100)]
Merge commit '
e4155f15b35c4272a235f5521d2dc6c2aabdd462'
* commit '
e4155f15b35c4272a235f5521d2dc6c2aabdd462':
eamad: use the AVFrame API properly.
dpxenc: use the AVFrame API properly.
bmpenc: use the AVFrame API properly.
sgienc: use the AVFrame API properly.
Conflicts:
libavcodec/bmpenc.c
libavcodec/dpxenc.c
libavcodec/eamad.c
libavcodec/sgienc.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
(cherry picked from commit
9ad477d9098b5281cede0bd8525ca90b0e52436d)
Conflicts:
libavcodec/eamad.c
Author of the merged code: Anton Khirnov
Michael Niedermayer [Sun, 17 Nov 2013 01:43:57 +0000 (02:43 +0100)]
Merge commit '
730bac7bab3c7dcd9fcb7c70f154e5f4cfaef9a7'
* commit '
730bac7bab3c7dcd9fcb7c70f154e5f4cfaef9a7':
mss4: use the AVFrame API properly.
mss3: use the AVFrame API properly.
mss2: use the AVFrame API properly.
mss1: use the AVFrame API properly.
Conflicts:
libavcodec/mss1.c
libavcodec/mss2.c
libavcodec/mss3.c
libavcodec/mss4.c
See:
02fe531afefa7ac3fcc552f8e83461a4bfa7f868
See:
ff1c13b133d548b3ce103f91999b6cc1bb7e65cc
See:
310bf283542ff81a9ec8fa7492fe7d625e80562f
Merged-by: Michael Niedermayer <michaelni@gmx.at>
(cherry picked from commit
8d193a24f2da825aaf5382e4aa42ab533806b033)
Author of the merged code: Anton Khirnov
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Sun, 17 Nov 2013 01:33:49 +0000 (02:33 +0100)]
Merge commit '
508b37557bf36eae83c18e64d42f27b44a321d81'
* commit '
508b37557bf36eae83c18e64d42f27b44a321d81':
tiertexseqv: use the AVFrame API properly.
smc: use the AVFrame API properly.
truemotion2: use the AVFrame API properly.
truemotion1: use the AVFrame API properly.
Conflicts:
libavcodec/smc.c
libavcodec/tiertexseqv.c
libavcodec/truemotion1.c
libavcodec/truemotion2.c
See:
e999f2339ab0200039ee7123b75d79a52aaac5d1
Merged-by: Michael Niedermayer <michaelni@gmx.at>
(cherry picked from commit
72df87088c8a6593d66b207140edd32b4d2fb6ee)
Author of the merged code: Anton Khirnov
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Sun, 17 Nov 2013 01:24:27 +0000 (02:24 +0100)]
Merge commit '
4a4841d4e0f0dc50998511bf6c48b518012024db'
* commit '
4a4841d4e0f0dc50998511bf6c48b518012024db':
fraps: use the AVFrame API properly.
rpza: use the AVFrame API properly.
motionpixels: use the AVFrame API properly.
vmdvideo: use the AVFrame API properly.
Conflicts:
libavcodec/fraps.c
libavcodec/motionpixels.c
libavcodec/rpza.c
libavcodec/vmdav.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
(cherry picked from commit
4362f272c0ae280cde833589e5c9c6696bd878d5)
Conflicts:
libavcodec/vmdav.c
Author of the merged code: Anton Khirnov
Michael Niedermayer [Sun, 17 Nov 2013 01:09:29 +0000 (02:09 +0100)]
Merge commit '
3c8ea9d4a74fd4d7493d40c818ca64ee492709f3'
* commit '
3c8ea9d4a74fd4d7493d40c818ca64ee492709f3':
vmnc: use the AVFrame API properly.
xan: use the AVFrame API properly.
xxan: use the AVFrame API properly.
zerocodec: use the AVFrame API properly.
Conflicts:
libavcodec/vmnc.c
libavcodec/xan.c
libavcodec/xxan.c
See:
cf5ab8b6f71699a48a6384d5e5779630b4be7b56
See:
ad438f450b83882a1277a79c1c3d6dfe55573b1c
See:
67607e20e882eb5639a4e9099caecb52a863ab68
Merged-by: Michael Niedermayer <michaelni@gmx.at>
(cherry picked from commit
8af7774c7aca6f3b595d0417b92f543ce0c7b537)
Author of the merged code: Anton Khirnov
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Sun, 17 Nov 2013 00:48:57 +0000 (01:48 +0100)]
Merge commit '
a837c4f2df96a30bf9aa4115b426d608487c7101'
* commit '
a837c4f2df96a30bf9aa4115b426d608487c7101':
zmbvenc: use the AVFrame API properly.
flicvideo: use the AVFrame API properly.
smacker: use the AVFrame API properly.
mmvideo: use the AVFrame API properly.
Conflicts:
libavcodec/flicvideo.c
libavcodec/mmvideo.c
libavcodec/smacker.c
libavcodec/zmbvenc.c
See:
76e27b1d0594199b4b1ff8520312069f42373944
See:
099e57bc38d7e53cf6823dfec349ff9fdaee99ba
Merged-by: Michael Niedermayer <michaelni@gmx.at>
(cherry picked from commit
fe3808eddee81ce4712d1e729fa6fe619f1685c8)
Author of the merged code: Anton Khirnov
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Sun, 17 Nov 2013 00:36:26 +0000 (01:36 +0100)]
Merge commit '
2e09096da912f563c4dd889a8f25c314529bbaa6'
* commit '
2e09096da912f563c4dd889a8f25c314529bbaa6':
kgv1: use the AVFrame API properly.
indeo2: use the AVFrame API properly.
iff: use the AVFrame API properly.
msrle: use the AVFrame API properly.
Conflicts:
libavcodec/iff.c
libavcodec/indeo2.c
libavcodec/kgv1dec.c
libavcodec/msrle.c
See:
451b2ca1b4349f9b60416cc057eaf5518d81025c
See:
80e9e63c946660304fc65fa8141ccfdbe4d196d1
See:
057dce5f21cd70db1ef6e3b67644a39f0d51aba5
Merged-by: Michael Niedermayer <michaelni@gmx.at>
(cherry picked from commit
9f890a165666a73376c73b3c2bd920345b5c3b79)
Author of the merged code: Anton Khirnov
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Sun, 17 Nov 2013 00:16:26 +0000 (01:16 +0100)]
Merge commit '
b7462a3904d71ff799584faf5b875cad59ca2f31'
* commit '
b7462a3904d71ff799584faf5b875cad59ca2f31':
jvdec: use the AVFrame API properly.
Conflicts:
libavcodec/jvdec.c
See:
678431d3f2c5f35fe48b02d5035604ace742be2e
Merged-by: Michael Niedermayer <michaelni@gmx.at>
(cherry picked from commit
ddfdcd2b5ecce0914c1eefa6269060bdbc879b17)
Author of the merged code: Anton Khirnov
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Sun, 17 Nov 2013 00:07:37 +0000 (01:07 +0100)]
Merge commit '
2d2a92f72199823a92e4e226c32e42a27ec801c0'
* commit '
2d2a92f72199823a92e4e226c32e42a27ec801c0':
dxa: use the AVFrame API properly.
qpeg: use the AVFrame API properly.
cin video: use the AVFrame API properly.
msvideo1: use the AVFrame API properly.
Conflicts:
libavcodec/dsicinav.c
libavcodec/dxa.c
libavcodec/msvideo1.c
libavcodec/qpeg.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
(cherry picked from commit
5219afc09d8e97e18917738cbc052f903df9a619)
Author of the merged code: Anton Khirnov
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Sat, 16 Nov 2013 23:40:59 +0000 (00:40 +0100)]
Merge commit '
a639ea7f4bc44bf6bfa452675558a342924a66a9'
* commit '
a639ea7f4bc44bf6bfa452675558a342924a66a9':
escape124: use the AVFrame API properly.
qtrle: use the AVFrame API properly.
cljr: use the AVFrame API properly.
cinepak: use the AVFrame API properly.
Conflicts:
libavcodec/cinepak.c
libavcodec/cljr.c
libavcodec/qtrle.c
See:
80e9e63c libavcodec/cinepak.c
See:
71c378984b0bd5470f67c424a79a4750f84d2d3e
Merged-by: Michael Niedermayer <michaelni@gmx.at>
(cherry picked from commit
bfb1f44d246f4ed97d5cad9c1eace8a20951ff76)
Author of the merged code: Anton Khirnov
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Sat, 16 Nov 2013 23:21:16 +0000 (00:21 +0100)]
Merge commit '
cec5ce49229d61e4eb1f331a6d0dff3aa24f6655'
* commit '
cec5ce49229d61e4eb1f331a6d0dff3aa24f6655':
cdxl: remove an unused variable
c93: use the AVFrame API properly.
bethsoftvid: use the AVFrame API properly.
avs: use the AVFrame API properly.
Conflicts:
libavcodec/bethsoftvideo.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
(cherry picked from commit
21c41e76d7c1ddaadafc9da50e99db51358f3754)
Conflicts:
libavcodec/avs.c
Author of the merged code: Anton Khirnov
Michael Niedermayer [Sat, 16 Nov 2013 23:11:33 +0000 (00:11 +0100)]
Merge commit '
6139f481ac9feb1bee4e7d04789fb15d7f24ebbf'
* commit '
6139f481ac9feb1bee4e7d04789fb15d7f24ebbf':
asvenc: use the AVFrame API properly.
a64multienc: use the AVFrame API properly.
Conflicts:
libavcodec/vaapi_mpeg.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
(cherry picked from commit
cc4a6435638fa2a471fef048a3e68eaf7e6e306c)
Author of the merged code: Anton Khirnov
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Dale Curtis [Thu, 2 Jan 2014 22:29:38 +0000 (14:29 -0800)]
h264: Clear ERContext.cur_pic when unref'ing current picture.
Signed-off-by: Dale Curtis <dalecurtis@chromium.org>
(cherry picked from commit
4feca2214a0b69dcbe4d1c7cd145c3881459e867)
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Wed, 18 Dec 2013 04:20:11 +0000 (05:20 +0100)]
configure: support raising major version in soname
this allows seperate installation of shared libs that should not conflict with
whatever is already installed.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
(cherry picked from commit
102b794e09482fec881e7ec903e57914895f9b74)
Conflicts:
libavcodec/utils.c
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Sat, 7 Dec 2013 01:04:31 +0000 (02:04 +0100)]
swscale/utils: fill xyz tables only when they will be used
makes the first call to sws_getContext() 1ms faster
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
(cherry picked from commit
4d18060e56aac9d7248854ba75d5fc19f5cd3db8)
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Fri, 6 Dec 2013 22:30:34 +0000 (23:30 +0100)]
avutil/log: skip IO calls on empty strings
These occur when no context is set for example, thus they are common
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
(cherry picked from commit
a044a183a3fb90b20a8deaa3ea1158510bcdd420)
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Fri, 6 Dec 2013 14:24:10 +0000 (15:24 +0100)]
do O(1) instead of O(n) atomic operations in register functions
about 1ms faster startup time
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
(cherry picked from commit
133fbfc7811ffae7b97dd129fcd0b5e646742362)
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Tue, 26 Nov 2013 22:27:21 +0000 (23:27 +0100)]
avcodec/g2meet: fix stride calculation, use correct format field
Fixes out of array accesses
Fixes: asan_heap-oob_ae5f63_5415_g2m4.wmv
Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
(cherry picked from commit
83f7bd6dcf00875725c5f3b7e1bedac5a6b3c77d)
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Paul B Mahol [Fri, 15 Nov 2013 01:09:06 +0000 (01:09 +0000)]
avcodec/libopusenc: change default frame duration to 20 ms
20 ms is used by libopus encoder.
Signed-off-by: Paul B Mahol <onemda@gmail.com>
(cherry picked from commit
74906d3727ec3bd9b7b28dfa7a98ff6e8cf8b6d7)
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Jan Gerber [Sat, 16 Nov 2013 00:12:20 +0000 (01:12 +0100)]
lavf/matroskadec ReferenceBlock is a signed integer
according to the Matroska Specification
ReferenceBlock is a signed integer too.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
(cherry picked from commit
8cc59ec881b8706fb3036a2a83f7ededa468dedb)
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Jan Gerber [Thu, 14 Nov 2013 11:58:28 +0000 (12:58 +0100)]
lavf/matroska*: DiscardPadding is a signed integer
according to the Matriska Specification
http://matroska.org/technical/specs/index.html
DiscardPadding is a signed integer.
Tested-by: Jan Gerber <j@v2v.cc>
Tested-by: James Almer <jamrial@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
(cherry picked from commit
f4b1ca99ff86c6ba78e1b4730c85eac0d5a5817a)
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
OSDN Git Service
