Matthieu Bouron
c8dace2728
ffmpeg: fix broken channel_layout option
...
Fixes ticket #2163 .
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
(cherry picked from commit 5a67e30b1c
2013-02-01 23:09:50 +01:00
Carl Eugen Hoyos
9bcb84810f
doc/muxers.texi: Fix mp3 picture attachment documentation.
...
(cherry picked from commit 99eedfc400
2013-02-01 17:57:12 +01:00
Peter Ross
54e19092fd
wtvdec: demux thumbnail picture to AVStream.attached_pic
...
Fixes ticket #2133 .
(cherry picked from commit 508836932f
2013-01-30 09:49:59 +01:00
Michael Niedermayer
bfd586577c
movenc: check that fps for tmcd is within encodable range.
...
The fps is stored as a 8 bit value thus 255 is the maximum encodable.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
(cherry picked from commit 55d66b2790
2013-01-28 02:04:38 +01:00
Michael Niedermayer
5589549c1d
movenc: Calculate fps for tmcd without intermediate step.
...
Fixes part of Ticket2045
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
(cherry picked from commit 9362f31b55
2013-01-28 02:04:37 +01:00
Michael Niedermayer
5c316acaa0
ffmpeg: copy tmcd track timebase parameters
...
Fixes part of Ticket2045
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
(cherry picked from commit bee044d7c2
2013-01-28 02:04:36 +01:00
Michael Niedermayer
f4fb841ad1
sanm: check image dimensions before using them
...
Avoids integer overflows and out of array accesses.
Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
(cherry picked from commit 49b729d3af
2013-01-28 01:57:39 +01:00
Xi Wang
c2d11275f7
rtmp: fix buffer overflows in ff_amf_tag_contents()
...
A negative `size' will bypass FFMIN(). In the subsequent memcpy() call,
`size' will be considered as a large positive value, leading to a buffer
overflow.
Change the type of `size' to unsigned int to avoid buffer overflow, and
simplify overflow checks accordingly.
Signed-off-by: Xi Wang <xi.wang@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
(cherry picked from commit 4e692374f7
2013-01-28 01:57:39 +01:00
Xi Wang
b54c155f5b
rtmp: fix multiple broken overflow checks
...
Sanity checks like `data + size >= data_end || data + size < data' are
broken, because `data + size < data' assumes pointer overflow, which is
undefined behavior in C. Many compilers such as gcc/clang optimize such
checks away.
Use `size < 0 || size >= data_end - data' instead.
Signed-off-by: Xi Wang <xi.wang@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
(cherry picked from commit 902cfe2f74
2013-01-28 01:57:39 +01:00
Xi Wang
ea2d44503f
rtpenc: fix overflow checking in avc_mp4_find_startcode()
...
The check `start + res < start' is broken since pointer overflow is
undefined behavior in C. Many compilers such as gcc/clang optimize
away this check.
Use `res > end - start' instead. Also change `res' to unsigned int
to avoid signed left-shift overflow.
Signed-off-by: Xi Wang <xi.wang@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
(cherry picked from commit 2f014567cf
2013-01-28 01:57:39 +01:00
Michael Niedermayer
59f7d583a3
mpeg1enc: Disable threads for resolutions too large for multi-threading
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
(cherry picked from commit 0c6b0409af
2013-01-28 01:57:39 +01:00
Clément Bœsch
fb876e4572
lavf/srtdec: do not try to queue empty subtitle chunks.
...
Regression since 3af3a30f2b6aabd3d
2013-01-27 16:32:57 +01:00
Paul B Mahol
c2d2bf1d6b
lavc/iff: ilbm: unbreak decoding on big endian
...
Fixes ticket #2192 .
Signed-off-by: Paul B Mahol <onemda@gmail.com>
(cherry picked from commit 25c75525bf
2013-01-26 15:10:02 +01:00
Michael Karcher
302094e1d2
Fix atrac3 decoder broken in e55d53905f
...
Signed-off-by: Michael Karcher <ffmpeg@mkarcher.dialup.fu-berlin.de>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
(cherry picked from commit dcbb920f15
2013-01-26 03:36:18 +01:00
Carl Eugen Hoyos
33769e908d
matroskaenc: add codec_tag lists back.
...
This reverts 312645e#2169 .
(cherry picked from commit df39c3ce38
2013-01-24 02:30:40 +01:00
Michael Niedermayer
edc00dea02
update for 1.1.1
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-01-20 01:11:06 +01:00
Michael Niedermayer
1135928903
init_get_bits: fix off by 1 error
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
(cherry picked from commit 7980cca05c
2013-01-19 17:59:23 +01:00
Michael Niedermayer
6f3bc92c29
init_get_bits8: zero pointers & struct on error
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
(cherry picked from commit 153fad14e5
2013-01-19 17:59:22 +01:00
Michael Niedermayer
bd531038e8
init_get_bits8: check byte_size against being positive
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
(cherry picked from commit ac73d3a12a
2013-01-19 17:59:21 +01:00
Carl Eugen Hoyos
90da0cb60e
The c99-to-c89 binaries are now hosted on videolan.org.
...
(cherry picked from commit c29c7c1470
2013-01-19 17:59:20 +01:00
Michael Niedermayer
3049d5b9b3
doc/RELEASE_NOTES
...
mention changed sample_fmt for audio decoders
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-01-19 16:31:51 +01:00
Michael Niedermayer
43c6b45a53
avcodec_decode_audio: do not trust the channel layout, use the channel count.
...
Fixes memory corruption
Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
(cherry picked from commit d270c32025
2013-01-19 16:18:08 +01:00
Michael Niedermayer
68a0477bc0
error_concealment: Check that the picture is not in a half setup state.
...
Fixes state becoming inconsistent
Fixes a null pointer dereference
Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
(cherry picked from commit 23318a5735
2013-01-19 16:18:01 +01:00
Paul B Mahol
ccf0cd967d
012v: remove double ; and return correct error code if ff_get_buffer() fails
...
Signed-off-by: Paul B Mahol <onemda@gmail.com>
(cherry picked from commit 2516023695
2013-01-19 16:17:24 +01:00
Michael Niedermayer
002ad7cd39
Merge remote-tracking branch 'qatar/release/9' into release/1.1
...
* qatar/release/9:
fate: update ref after rv30_loop_filter fix
rv30: fix masking in rv30_loop_filter()
libcdio: support recent cdio-paranoia
theora: Skip zero-sized headers
h264: add 3 pixels below for subpixel filter wait position
h264: fix ff_generate_sliding_window_mmcos() prototype.
h264: don't clobber mmco opcode tables for non-first slice headers.
Conflicts:
configure
libavcodec/h264_refs.c
tests/ref/fate/filter-delogo
tests/ref/fate/rv30
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-01-19 15:54:36 +01:00
Jonas Bechtel
397fafad23
Fix opencv detection.
...
This commit changes the ".so" argument placement in check_ld sub-program.
(cherry picked from commit a003c5bd4f
2013-01-18 10:32:49 +01:00
Michael Niedermayer
30f0cd2f1e
h264: fix () placement
...
Fixes null pointer dereference
Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
(cherry picked from commit c13e4e288c
2013-01-18 05:14:31 +01:00
Michael Niedermayer
4d6d8d9ae9
rtmpproto: Fix assignments in if()
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
(cherry picked from commit a601eb9543
2013-01-18 05:14:31 +01:00
Michael Niedermayer
9348514a67
lavf/mux: Fix assignments in if()
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
(cherry picked from commit 1ac5a8d7e3
2013-01-18 05:14:31 +01:00
Michael Niedermayer
17704500fb
vsrc_testsrc: Fix assignments in if()
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
(cherry picked from commit 6f88d2d786
2013-01-18 05:14:31 +01:00
Michael Niedermayer
2338eda8d8
tiff: Fix assignments in if()
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
(cherry picked from commit 659546b42d
2013-01-18 05:14:31 +01:00
Michael Niedermayer
6a0633e961
svq1enc: Fix assignments in if()
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
(cherry picked from commit 37be1d802f
2013-01-18 05:14:31 +01:00
Michael Niedermayer
16dc41de27
ra144enc: Fix assignments in if()
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
(cherry picked from commit e2704381e5
2013-01-18 05:14:31 +01:00
Michael Niedermayer
ab471e17e4
nellymoserenc: Fix assignments in if()
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
(cherry picked from commit 795d2dc23b
2013-01-18 05:14:31 +01:00
Michael Niedermayer
3be8aeb14e
libvorbisenc: Fix assignments in if()
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
(cherry picked from commit bdd71abe5f
2013-01-18 05:14:31 +01:00
Michael Niedermayer
b48e251360
libvo-aacenc: Fix assignments in if()
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
(cherry picked from commit 0ccb31dcad
2013-01-18 05:14:31 +01:00
Michael Niedermayer
65a4b90840
libspeexenc: Fix assignments in if()
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
(cherry picked from commit 3b8d66d531
2013-01-18 05:14:31 +01:00
Michael Niedermayer
59956a5957
libopencore-amr: Fix assignments in if()
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
(cherry picked from commit d6180aa297
2013-01-18 05:14:31 +01:00
Michael Niedermayer
d4a08e560d
libmp3lame: Fix assignments in if()
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
(cherry picked from commit 871b6ec01d
2013-01-18 05:14:31 +01:00
Michael Niedermayer
dacac91973
libfdk-aacenc: Fix assignments in if()
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
(cherry picked from commit 9302ad1ac8
2013-01-18 05:14:30 +01:00
Michael Niedermayer
d39400fed7
libfaac: Fix assignments in if()
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
(cherry picked from commit 68a25c64cd
2013-01-18 05:14:30 +01:00
Michael Niedermayer
07174ed841
aacenc: Fix assignments in if()
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
(cherry picked from commit 98fed59427
2013-01-18 05:14:30 +01:00
Michael Niedermayer
e7475335b1
doc/examples: fix assignments in if()
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
(cherry picked from commit 48a7981e6f
2013-01-18 05:14:30 +01:00
Michael Niedermayer
722bfe4e7c
swr: fix handling of timestamps that cause multiple drops or silence injections
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
(cherry picked from commit d676598f87
2013-01-18 05:14:30 +01:00
Michael Niedermayer
cc8ab98656
mpeg12enc: check dimension validity
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-01-18 05:14:30 +01:00
Michael Niedermayer
d7cff9f8e8
mpeg12enc: Correctly mask dimensions
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-01-18 05:14:30 +01:00
Michael Niedermayer
9bfda9df71
mpeg12: Support decoding dimensions that are a multiple of 4096
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-01-18 05:14:30 +01:00
Luca Barbato
0a837b6317
fate: update ref after rv30_loop_filter fix
...
(cherry picked from commit 56ef1ef1f7
2013-01-17 23:47:01 +01:00
Xi Wang
c3c1db7c56
rv30: fix masking in rv30_loop_filter()
...
The mask `x && (1 << y)' is incorrect and always yields true.
The correct form should be `x & (1 << y)'.
CC: libav-stable@libav.org
Signed-off-by: Xi Wang <xi.wang@gmail.com>
(cherry picked from commit 783e37f7ef
2013-01-17 22:00:01 +01:00
Luca Barbato
21ca4ab944
libcdio: support recent cdio-paranoia
...
Upstream decided to split the paranoia interface and move the headers
accordingly.
(cherry picked from commit 57224e425c567a87798b66425acc383c6dd37331)
Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
2013-01-17 21:42:03 +01:00
