Michael Niedermayer
6659364d3a
Merge commit '797f2a791397210ec1b591b326658805c5dbf104'
...
* commit '797f2a791397210ec1b591b326658805c5dbf104':
hdsenc: Check the init_file() return code
hdsenc: Fix an off by one error in an array size check
hdsenc: Avoid integer overflow
Conflicts:
libavformat/hdsenc.c
See: 572965c9a6
See: 3dbf9afe85
See: 6722e564a8
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-12-14 22:17:17 +01:00
Michael Niedermayer
f357ef2e0c
Merge commit '5db4e88ecd32485341f6150c00f5ee5bfa74f62d'
...
* commit '5db4e88ecd32485341f6150c00f5ee5bfa74f62d':
configure: Detect Solaris libc in an OpenIndiana/illumos compatible way
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-12-14 22:14:01 +01:00
Michael Niedermayer
892562e921
avformat/ipmovie: Check OPCODE_CREATE_TIMER size
...
Fixes use of uninitialized memory
Fixes: msan_uninit-mem_7f81e836ef8c_5930_ipmovie_interplayvideo_interplay_dpcm__bislogo.mve
Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-12-14 21:59:28 +01:00
Stefano Sabatini
de9ea40a40
doc/bitstream_filters: remove mp3_header_decompress filter
...
It was removed in commit c6080d8900
.
2013-12-14 21:47:51 +01:00
Timothy Gu
96093fe180
Changelog: correct typo
...
Signed-off-by: Timothy Gu <timothygu99@gmail.com>
2013-12-14 21:47:17 +01:00
Yu Xiaolei
20bc574b86
build fix: apetag.c depends on img2.c
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-12-14 18:51:17 +01:00
Michael Niedermayer
2d50ebc20b
Merge remote-tracking branch 'rbultje/vp9-simd'
...
* rbultje/vp9-simd:
vp9/x86: idct_add_16x16_ssse3.
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-12-14 18:13:07 +01:00
Ronald S. Bultje
8d4c616fc0
vp9/x86: idct_add_16x16_ssse3.
...
Currently only dc-only and full 16x16. Other subforms will follow in the
near future. Total decoding time of ped1080p.webm goes from 9.7 to 9.3
seconds. DC-only goes from 957 -> 131 cycles, and the full IDCT goes
from ~4050 to ~745 cycles.
2013-12-14 12:13:26 -05:00
Michael Niedermayer
2224159c78
avcodec/vc1: fix DIFF2/NORM2 with width<=16
...
Fixes read of uninitialized memory
Fixes msan_uninit-mem_7f785da000e8_585_480i30__codec_WVC1__mode_2__framerate_29.970__type_2__preproc_17.wmv
Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-12-14 18:02:01 +01:00
Michael Niedermayer
c9f72e4b81
avcodec/vc1dec: fix mby_start for interlaced content
...
Fixes first frame of Ticket2531
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-12-14 17:12:18 +01:00
Michael Niedermayer
017e234c20
avcodec/vc1: fix mb_height for field pictures
...
Fixes ticket2531
Tables are always allocated now with sufficient space for either progressive
or interlaced content. The alternative would be to detect a change
and reallocate.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-12-14 16:50:21 +01:00
Michael Niedermayer
9aba0a6f7b
rtpdec_h264: Check the return value of functions doing allocations
...
Signed-off-by: Martin Storsjö <martin@martin.st>
2013-12-14 17:48:46 +02:00
Martin Storsjö
6451c8853a
sdp: Check theora colorspace before producing the configuration string
...
This avoids a memory leak (or having to worry about freeing the
config string) if the colorspace isn't accepted.
Signed-off-by: Martin Storsjö <martin@martin.st>
2013-12-14 17:48:46 +02:00
Michael Niedermayer
797f2a7913
hdsenc: Check the init_file() return code
...
Signed-off-by: Martin Storsjö <martin@martin.st>
2013-12-14 17:48:46 +02:00
Michael Niedermayer
b8ed15d637
hdsenc: Fix an off by one error in an array size check
...
Signed-off-by: Martin Storsjö <martin@martin.st>
2013-12-14 17:48:42 +02:00
Michael Niedermayer
417927af3c
hdsenc: Avoid integer overflow
...
Also remove a silly leftover pair of parentheses.
Signed-off-by: Martin Storsjö <martin@martin.st>
2013-12-14 17:48:28 +02:00
Marton Balint
97f880e7a9
libzvbi-teletextdec: set bitmap teletext canvas dimensions
...
Signed-off-by: Marton Balint <cus@passwd.hu>
2013-12-14 15:57:44 +01:00
Marton Balint
c77e0c2130
libzvbi-teletextdec: add chopped top row size to y offset
...
Signed-off-by: Marton Balint <cus@passwd.hu>
2013-12-14 15:57:44 +01:00
Marton Balint
249a435989
libzvbi-teletextdec: use defined constants for bitmap char width and height
...
Signed-off-by: Marton Balint <cus@passwd.hu>
2013-12-14 15:57:44 +01:00
Marton Balint
b50968169d
libzvbi-teletextdec: cosmetics
...
Signed-off-by: Marton Balint <cus@passwd.hu>
2013-12-14 15:57:43 +01:00
Diego Biurrun
5db4e88ecd
configure: Detect Solaris libc in an OpenIndiana/illumos compatible way
2013-12-14 14:09:40 +01:00
Timothy Gu
c65fe9e982
examples/decoding_encoding: check av_samples_get_buffer_size() return code
...
Fixes CID1135756.
Signed-off-by: Timothy Gu <timothygu99@gmail.com>
2013-12-14 14:02:49 +01:00
Timothy Gu
b242c156e5
examples/resample_audio: check av_samples_get_buffer_size() return code
...
Fixes CID1135757.
Signed-off-by: Timothy Gu <timothygu99@gmail.com>
2013-12-14 14:02:33 +01:00
Stefano Sabatini
66a703ea01
ffprobe: only show tags when explicitly requested
2013-12-14 13:22:04 +01:00
Stefano Sabatini
2cfe70ff3e
lavf/movenc: return meaningful error code from mov_write_header()
2013-12-14 13:21:58 +01:00
Stefano Sabatini
54c596fe7a
lavf/movenc: improve feedback in case of unsupported codec
2013-12-14 13:21:51 +01:00
Michael Niedermayer
688c3d944d
Merge remote-tracking branch 'qatar/master'
...
* qatar/master:
doxy: Define a group for libswscale documentation
Conflicts:
libavutil/avutil.h
libswscale/swscale.h
See: 18d9398143
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-12-14 13:09:30 +01:00
Michael Niedermayer
f5013913da
Merge commit 'a5a3b398fd9dce38ca50b20f182b17a256d209f2'
...
* commit 'a5a3b398fd9dce38ca50b20f182b17a256d209f2':
configure: Reorder pthreads checks
Conflicts:
configure
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-12-14 12:37:40 +01:00
Michael Niedermayer
7431923da8
Merge commit '7cbe1ea9df83ec66403fbf6400353bcb2242bf06'
...
* commit '7cbe1ea9df83ec66403fbf6400353bcb2242bf06':
configure: Move the bz2 and zlib checks below phtreads
Conflicts:
configure
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-12-14 11:23:57 +01:00
Michael Niedermayer
acda7c8e20
Merge commit '70a7b24d56a823894440a372c46e89e212b89c35'
...
* commit '70a7b24d56a823894440a372c46e89e212b89c35':
avutil: Add deprecation ifdefs around obsolete intfloat code
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-12-14 11:13:55 +01:00
Michael Niedermayer
2cfccd8060
avcodec/vc1: Factorize imode enum out / remove duplication
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-12-14 05:16:25 +01:00
Guillaume Martres
ecb21d2437
hevc: rename ptl structs and variables
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-12-14 03:01:56 +01:00
Guillaume Martres
c90cdf4b64
hevc: pack PTL representation using uint8_t
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-12-14 03:01:51 +01:00
Guillaume Martres
8e72e19f64
hevc: remove unused PTL flags
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-12-14 03:01:46 +01:00
Guillaume Martres
dddc9b7a8e
hevc: don't check for errors in PTL code
...
The value of XXX_reserved_zero_44bits should be ignored, no need to
report an error when it's not zero.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-12-14 03:01:35 +01:00
Guillaume Martres
c6afd0aacc
hevc: fix PTL parsing
...
This was broken in commit 36658c978f
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-12-14 03:01:22 +01:00
Michael Niedermayer
445c58a8c6
swscale/x86/rgb2rgb: Make sure COMPILE_TEMPLATE_AVX is defined
...
Found-by: iive
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-12-14 02:54:28 +01:00
Michael Niedermayer
3f4290a206
swscale/x86/rgb2rgb_template: try to fix build without AVX
...
Found-by: iive
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-12-14 02:22:44 +01:00
Michael Niedermayer
48016f8feb
avcodec/vc1dec: propagate errors from vc1_parse_sprites()
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-12-14 01:46:11 +01:00
Michael Niedermayer
5f00b333a4
avcodec/vc1dec: zero SpriteData struct
...
Fixes use of uninitialized data, as alternative alpha could be
calculated conditionally
Fixes part of msan_uninit-mem_7f51a8b0b3b0_1009_Arlington.wmv
Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-12-14 01:46:11 +01:00
Michael Niedermayer
cf95dee3de
avcodec/vc1dec: dont calculate unused values from uninitialized sprites
...
Fixes use of uninitialized data
Fixes part of msan_uninit-mem_7f51a8b0b3b0_1009_Arlington.wmv
Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-12-14 00:59:43 +01:00
Luca Barbato
c85aad9cb2
doxy: Define a group for libswscale documentation
...
Uniform the style and eliminate a warning on newer doxygen version..
2013-12-13 23:53:30 +01:00
Luca Barbato
a5a3b398fd
configure: Reorder pthreads checks
...
Some pthreads symbols might be present in libc (as shown on various *BSD)
but not all of them, leading to false positives.
Check for the most common compiler flags before the plain symbol check
to avoid known pitfalls.
2013-12-13 23:53:30 +01:00
Luca Barbato
7cbe1ea9df
configure: Move the bz2 and zlib checks below phtreads
...
There are alternate implementations of those libraries that use pthreads.
2013-12-13 23:53:30 +01:00
Diego Biurrun
70a7b24d56
avutil: Add deprecation ifdefs around obsolete intfloat code
...
This long-deprecated code should disappear at the next version bump.
2013-12-13 23:45:54 +01:00
Michael Niedermayer
f5cf0ea93a
avformat/asf: clear uninitialized areas of packets before returning them
...
Fixes use of uninitialized variables
Fixes msan_uninit-mem_7f839282b6ce_7273_msn08_VBRq70_800x600.wmv
Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-12-13 23:32:45 +01:00
Michael Niedermayer
0f242e62b4
Merge remote-tracking branch 'qatar/master'
...
* qatar/master:
build: Merge pthreads/w32threads OBJS declarations
Conflicts:
libavcodec/Makefile
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-12-13 21:33:13 +01:00
Michael Niedermayer
1e3718e2a1
Merge commit '7c3388711b7243d059db39aa04b754baf2156934'
...
* commit '7c3388711b7243d059db39aa04b754baf2156934':
configure: Add -D__USE_MINGW_ANSI_STDIO=1 to CPPFLAGS on MinGW32
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-12-13 21:26:13 +01:00
Michael Niedermayer
2a459f5d87
Merge commit 'bdc111a162094c14660d1e88839d103a4d79e42a'
...
* commit 'bdc111a162094c14660d1e88839d103a4d79e42a':
configure: Detect newer (>=4.1) versions of MinGW32
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-12-13 20:49:22 +01:00
Michael Niedermayer
7b2a19cb9e
Merge commit 'a1d7d5524799bd90bc5d12e8b3063238cc0c02dd'
...
* commit 'a1d7d5524799bd90bc5d12e8b3063238cc0c02dd':
build: Do not add -g to HOSTCFLAGS
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-12-13 20:39:45 +01:00