Michael Niedermayer
b64b719ad5
Merge commit 'fcc1022611f79c2f3aa2f392a5ce14c74be9c1d7'
...
* commit 'fcc1022611f79c2f3aa2f392a5ce14c74be9c1d7':
vdpau: factor out common end-of-frame handling
Conflicts:
libavcodec/vdpau.c
libavcodec/vdpau_h264.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-10-06 12:09:17 +02:00
Michael Niedermayer
567c0dcee6
Merge commit '319424d25c53f82b87187ce03ed984d438f1bee6'
...
* commit '319424d25c53f82b87187ce03ed984d438f1bee6':
vdpau: add helper for VDPAU to libav error codes conversion
Conflicts:
libavcodec/vdpau.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-10-06 11:38:06 +02:00
Michael Niedermayer
6b347f519d
swresample/swresample: replace always true if() by av_assert0()
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-10-06 01:29:15 +02:00
Michael Niedermayer
f9fefa499f
swresample/swresample: fix sample drop loop end condition
...
Fixes Ticket3985
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-10-06 01:29:06 +02:00
Michael Niedermayer
02f7665a3c
avformat/mov: do not overwrite extradata in mov_read_glbl()
...
Fixes regression from Ticket3962
This basically favors the first global header while since 34751f8313
it was the last. If this heuristic turns out worse, do not hesitate to revert this and
reopen 3962 as a feature request for multiple STSD
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-10-06 00:17:33 +02:00
James Almer
fb7d8d50bc
swscale: remove obsolete FF_API_SWS_FORMAT_NAME cruft
...
Signed-off-by: James Almer <jamrial@gmail.com>
2014-10-05 17:10:29 -03:00
James Almer
ddc3768161
avformat: remove obsolete FF_API_READ_PACKET cruft
...
Signed-off-by: James Almer <jamrial@gmail.com>
2014-10-05 17:10:26 -03:00
James Almer
ecf457f3ac
avformat: remove obsolete FF_API_CLOSE_INPUT_FILE cruft
...
Signed-off-by: James Almer <jamrial@gmail.com>
2014-10-05 17:10:23 -03:00
James Almer
3bd9f17b8a
avformat: remove obsolete FF_API_SET_PTS_INFO cruft
...
Signed-off-by: James Almer <jamrial@gmail.com>
2014-10-05 17:10:20 -03:00
James Almer
a578b93c73
avformat: remove obsolete FF_API_NEW_STREAM cruft
...
Signed-off-by: James Almer <jamrial@gmail.com>
2014-10-05 17:10:15 -03:00
James Almer
cc787709ee
avformat: remove obsolete FF_API_FORMAT_PARAMETERS cruft
...
Signed-off-by: James Almer <jamrial@gmail.com>
2014-10-05 17:10:13 -03:00
James Almer
903a0acba4
avformat: remove obsolete FF_API_ALLOC_OUTPUT_CONTEXT cruft
...
Signed-off-by: James Almer <jamrial@gmail.com>
2014-10-05 17:10:07 -03:00
James Almer
e524a9b1ff
avutil: remove obsolete FF_API_INTFLOAT cruft
...
Signed-off-by: James Almer <jamrial@gmail.com>
2014-10-05 17:10:03 -03:00
James Almer
3e57520982
avutil: remove obsolete FF_API_SAMPLES_UTILS_RETURN_ZERO cruft
...
Signed-off-by: James Almer <jamrial@gmail.com>
2014-10-05 17:09:56 -03:00
James Almer
71718de814
avutil: remove obsolete FF_API_FIND_OPT cruft
...
Signed-off-by: James Almer <jamrial@gmail.com>
2014-10-05 17:09:53 -03:00
James Almer
1abb77285c
avutil: remove obsolete FF_API_GET_BITS_PER_SAMPLE_FMT cruft
...
Signed-off-by: James Almer <jamrial@gmail.com>
2014-10-05 17:09:49 -03:00
James Almer
42111bb960
avcodec: remove obsolete FF_API_FAST_MALLOC cruft
...
Signed-off-by: James Almer <jamrial@gmail.com>
2014-10-05 17:09:44 -03:00
Michael Niedermayer
c02ea58c5f
avformat/options_table: add FF_COMPLIANCE_UNOFFICIAL
...
Fixes ticket 3959
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-10-05 21:43:17 +02:00
Michael Niedermayer
70eba7695c
configure: add -lrt to libavutil when needed for nanosleep
...
This is similar to 7d97511e13
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-10-05 18:51:12 +02:00
Benoit Fouet
904cfd257d
avcodec/h264_mp4toannexb_bsf: reset the new IDR flag when SPS/PPS is seen.
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-10-05 14:47:04 +02:00
Michael Niedermayer
436206c175
avcodec/webp: add assert to ensure palette is not larger than 256
...
it should not be possible to be larger as its stored as 8bit value
but we would be overwriting a stack buffer if it is ...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-10-05 13:00:40 +02:00
Pascal Massimino
19fb476841
avcodec/webp: add optimization: use local palette with extra padding
...
for big enough pictures.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-10-05 12:47:44 +02:00
Rémi Denis-Courmont
fcc1022611
vdpau: factor out common end-of-frame handling
...
Also add error handling.
Signed-off-by: Anton Khirnov <anton@khirnov.net>
2014-10-05 10:13:44 +00:00
Rémi Denis-Courmont
319424d25c
vdpau: add helper for VDPAU to libav error codes conversion
...
Signed-off-by: Anton Khirnov <anton@khirnov.net>
2014-10-05 10:08:53 +00:00
Matthew Oliver
e81eca0ce5
configure: Set large address aware.
...
Enables >2GB memory usage for 32 bit compiles on Windows.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-10-05 05:33:36 +02:00
Alexander Strasser
e079d43af8
avformat/img2dec: Attempt to detect non-escaped glob patterns too (-pattern_type glob)
...
Fixes ticket #3948
Based-on-patch-by: Michael Niedermayer <michaelni@gmx.at>
Signed-off-by: Alexander Strasser <eclipse7@gmx.net>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-10-05 03:56:42 +02:00
Michael Niedermayer
345160a9cd
Merge commit '2a5ac99e6e06078713f684fee2466c91f677b303'
...
* commit '2a5ac99e6e06078713f684fee2466c91f677b303':
x11grab: Check the XQueryPointer return value
Conflicts:
libavdevice/x11grab.c
See: 69c34a6ac9
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-10-05 03:42:55 +02:00
Michael Niedermayer
8e5be0fffe
Merge commit '5b9c817dc7577b6d44acc94d73b9c77c52cda489'
...
* commit '5b9c817dc7577b6d44acc94d73b9c77c52cda489':
x11grab: Check XFixesGetCursorImage return value
Conflicts:
libavdevice/x11grab.c
See: a65c0a3fe8
The warning with adjusted text is kept from a65c0a3fe8
but drawing the cursor is not disabled in case XFixesGetCursorImage() fails
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-10-05 03:22:55 +02:00
Michael Niedermayer
98baa8151a
Merge commit '89fa2b5616274194d90bde0aeebf6adbd1245193'
...
* commit '89fa2b5616274194d90bde0aeebf6adbd1245193':
x11grab: Check for XFixes availability at runtime
See: a65c0a3fe8
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-10-05 03:14:35 +02:00
Michael Niedermayer
de52af9017
Merge commit '68211c70afcfd4d675029cc85fba7dee8de53bdf'
...
* commit '68211c70afcfd4d675029cc85fba7dee8de53bdf':
vc1: Do not assume seek happens after decoding
See: 6801eb0a09
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-10-05 02:58:48 +02:00
Michael Niedermayer
684508ba15
avformat/img2dec: Support -loop with pipes
...
Fixes Ticket3976
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-10-05 01:49:25 +02:00
Antonio Ospite
2a5ac99e6e
x11grab: Check the XQueryPointer return value
...
The paint_mouse_pointer() code uses XFixes to retrieve the cursor
coordinates, but XFixes gives no information about which screen the
pointer is on; this results in always drawing the cursor on the
captured screen even if the mouse pointer was on another screen.
For example, when capturing from screen 1 (i.e. -f x11grab -i ":0.1")
the cursor was being drawn in the captured image even when the mouse
pointer was actually on screen 0, which is wrong and visually confusing.
CC: libav-stable@libav.org
Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
2014-10-04 23:46:46 +02:00
Luca Barbato
5b9c817dc7
x11grab: Check XFixesGetCursorImage return value
...
It could return NULL if the cursor is outside the screen, the connection
timed out or the system is out of memory.
CC: libav-stable@libav.org
2014-10-04 23:46:46 +02:00
Luca Barbato
89fa2b5616
x11grab: Check for XFixes availability at runtime
2014-10-04 23:46:46 +02:00
Luca Barbato
68211c70af
vc1: Do not assume seek happens after decoding
...
If a seek is requested before the decoding start there is no
current picture.
CC: libav-stable@libav.org
2014-10-04 23:46:46 +02:00
Michael Niedermayer
550f3e9df3
avcodec/on2avc: Check number of channels
...
Fixes out of array access
Fixes: asan_heap-oob_4da4f3_7_asan_heap-oob_4da4f3_173_Xmen_avc_500.vp6
Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-10-04 22:15:54 +02:00
Michael Niedermayer
578da1f0dd
Merge commit '36f3aec3630f27df64f4ff2b52a1c9ced760eb52'
...
* commit '36f3aec3630f27df64f4ff2b52a1c9ced760eb52':
fate-vc1_ilaced_twomv: use -flags +bitexact
Conflicts:
tests/ref/fate/vc1_ilaced_twomv
See: 233d1acb70
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-10-04 21:38:16 +02:00
Mickaël Raulet
4ba6371a83
x86/hevc: get rid off packusdw for ssse3 compatibility
...
cherry picked from commit df8ebe304df453f26c28ff8f11d607f49b90a4c2
Fixes out of array access
Fixes: asan_stack-oob_1046454_9_asan_stack-oob_15a9e7c_170_WP_MAIN10_B_Toshiba_3.bit
Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-10-04 21:14:15 +02:00
Michael Niedermayer
df8394c693
avcodec/hevc: fix chroma transform_add size
...
Fixes accessing misaligned address
Fixes: signal_sigsegv_1feb99c_10_signal_sigsegv_2d1d35c_79_cov_691940146_EXT_A_ericsson_3.bit
Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-10-04 17:51:52 +02:00
Carl Eugen Hoyos
aaf65bc2a5
lavc/libx264: Fix compilation with libx264 version < 142.
2014-10-04 17:43:24 +02:00
Michael Niedermayer
9734a7a1de
avcodec/h264: Check mode before considering mixed mode intra prediction
...
Fixes out of array read
Fixes: asan_heap-oob_e476fc_2_asan_heap-oob_1333ec6_61_CAMACI3_Sony_C.jsv
Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-10-04 14:53:13 +02:00
Clément Bœsch
138902dfb6
avformat/assdec: make sure pos is initialized
...
Fixes use of uninitialized memory
Fixes: signal_sigsegv_504fb0_10_signal_sigsegv_504fb0_343_mewmew_ssa.avi
Found-by: Mateusz j00ru Jurczyk and Gynvael Coldwind
2014-10-04 12:27:58 +02:00
Michael Niedermayer
dceebe1a60
Merge commit '7d97511e13ef30cd99bae0e36400de055b72918d'
...
* commit '7d97511e13ef30cd99bae0e36400de055b72918d':
configure: Add -lrt dependency to avutil's pc file.
Conflicts:
configure
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-10-04 12:04:51 +02:00
Janne Grunau
36f3aec363
fate-vc1_ilaced_twomv: use -flags +bitexact
...
Also updates the reference since it was generated by the non-bitexact
x86 specific code.
2014-10-04 11:21:32 +02:00
Josh Allmann
7d97511e13
configure: Add -lrt dependency to avutil's pc file.
...
This is needed for clock_gettime.
Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
2014-10-04 09:10:04 +02:00
Michael Niedermayer
27f6da2921
avformat/mpegts: use a padded buffer in read_sl_header()
...
Fixes overread
Fixes: asan_heap-oob_84f75d_8_asan_heap-oob_a2a00a_341_mbc.ts
Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-10-04 05:15:11 +02:00
Michael Niedermayer
c3d7f00ee3
avformat/mpegts: Check desc_len / get8() return code
...
Fixes out of array read
Fixes: signal_sigsegv_844d59_10_signal_sigsegv_a17bb7_366_mpegts_mpeg2video_mp2_dvbsub_topfield.rec
Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-10-04 04:30:59 +02:00
Michael Niedermayer
8c50704ebf
avcodec/vorbisdec: Fix off by 1 error in ptns_to_read
...
Fixes read of uninitialized memory
Fixes: asan_heap-uaf_18dac2b_9_asan_heap-uaf_22eb375_208_beta3_test_small.ogg
Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-10-04 03:13:39 +02:00
Thomas Volkert
1c4c78ee40
sdp: add support for H.261
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-10-04 00:53:13 +02:00
Michael Niedermayer
075a165d27
avcodec/svq3: Dont memcpy AVFrame
...
This avoids out of array accesses
Fixes: asan_heap-uaf_21f42e4_9_asan_heap-uaf_21f42e4_278_gl2.mov
Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-10-04 00:21:17 +02:00