ffmpeg.git
5 years agoavcodec/cinepak: fix integer underflow
Michael Niedermayer [Fri, 3 Oct 2014 17:33:01 +0000 (19:33 +0200)]
avcodec/cinepak: fix integer underflow

Fixes out of array access
Fixes: asan_heap-oob_4da0ba_6_asan_heap-oob_4da0ba_241_cvid_crash.avi

Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
(cherry picked from commit e7e5114c506957f40aafd794e06de1a7e341e9d5)

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoavcodec/pngdec: Check bits per pixel before setting monoblack pixel format
Michael Niedermayer [Fri, 3 Oct 2014 15:35:58 +0000 (17:35 +0200)]
avcodec/pngdec: Check bits per pixel before setting monoblack pixel format

Fixes out of array accesses
Fixes: asan_heap-oob_14dbfcf_4_asan_heap-oob_1ce5767_179_add_method_small.png

Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
(cherry picked from commit 3e2b745020c2dbf0201fe7df3dad9e7e0b2e1bb6)

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoavcodec/pngdec: Calculate MPNG bytewidth more defensively
Michael Niedermayer [Fri, 3 Oct 2014 15:54:21 +0000 (17:54 +0200)]
avcodec/pngdec: Calculate MPNG bytewidth more defensively

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
(cherry picked from commit e830902934a29df05c7af65aef2a480b15f572c4)

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoavcodec/tiff: more completely check bpp/bppcount
Michael Niedermayer [Fri, 3 Oct 2014 14:08:32 +0000 (16:08 +0200)]
avcodec/tiff: more completely check bpp/bppcount

Fixes pixel format selection
Fixes out of array accesses
Fixes: asan_heap-oob_1766029_6_asan_heap-oob_20aa045_332_cov_1823216757_m2-d1d366d7965db766c19a66c7a2ccbb6b.tif

Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
(cherry picked from commit e1c0cfaa419aa5d320540d5a1b3f8fd9b82ab7e5)

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoavcodec/mmvideo: Bounds check 2nd line of HHV Intra blocks
Michael Niedermayer [Fri, 3 Oct 2014 12:45:04 +0000 (14:45 +0200)]
avcodec/mmvideo: Bounds check 2nd line of HHV Intra blocks

Fixes out of array access
Fixes: asan_heap-oob_4da4f3_8_asan_heap-oob_4da4f3_419_scene1a.mm

Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
(cherry picked from commit 8b0e96e1f21b761ca15dbb470cd619a1ebf86c3e)

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoavcodec/h263dec: Fix decoding messenger.h263
Michael Niedermayer [Fri, 3 Oct 2014 10:32:21 +0000 (12:32 +0200)]
avcodec/h263dec: Fix decoding messenger.h263

Fixes http://samples.mplayerhq.hu/V-codecs/h263/h263-raw/messenger.h263
Fixes regression since b239f3f6

Found-by: Josh Allmann
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
(cherry picked from commit d225b0f7aaa65eafccc87165130e1c4bab71708b)

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoavcodec/utils: Add case for jv to avcodec_align_dimensions2()
Michael Niedermayer [Fri, 3 Oct 2014 02:30:58 +0000 (04:30 +0200)]
avcodec/utils: Add case for jv to avcodec_align_dimensions2()

Fixes out of array accesses
Fixes: asan_heap-oob_12304aa_8_asan_heap-oob_4da4f3_300_intro.jv

Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
(cherry picked from commit 105654e376a736d243aef4a1d121abebce912e6b)

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoavcodec/mjpegdec: check bits per pixel for changes similar to dimensions
Michael Niedermayer [Thu, 2 Oct 2014 23:50:27 +0000 (01:50 +0200)]
avcodec/mjpegdec: check bits per pixel for changes similar to dimensions

Fixes out of array accesses
Fixes: asan_heap-oob_16668e9_2_asan_heap-oob_16668e9_346_miss_congeniality_pegasus_mjpg.avi

Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
(cherry picked from commit 5c378d6a6df8243f06c87962b873bd563e58cd39)

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoavcodec/jpeglsdec: Check run value more completely in ls_decode_line()
Michael Niedermayer [Thu, 2 Oct 2014 21:17:21 +0000 (23:17 +0200)]
avcodec/jpeglsdec: Check run value more completely in ls_decode_line()

previously it could have been by 1 too large
Fixes out of array access
Fixes: asan_heap-oob_12240f5_1_asan_heap-oob_12240f5_448_t8c1e3.jls
Fixes: asan_heap-oob_12240f5_1_asan_heap-oob_12240f5_448_t8nde0.jls
Fixes: asan_heap-oob_12240fa_1_asan_heap-oob_12240fa_448_t16e3.jls

Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
(cherry picked from commit 06e7d58410a17dc72c30ee7f3145fcacc425f4f2)

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoavformat/hlsenc: export inner muxer timebase
Michael Niedermayer [Sun, 28 Sep 2014 20:27:33 +0000 (22:27 +0200)]
avformat/hlsenc: export inner muxer timebase

Fixes "Non-monotonous DTS in output stream 0:0"
Fies Ticket 3797

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
(cherry picked from commit b1a0fccd023d9261274a92ec9482da03c4aa82fa)

Conflicts:

libavformat/hlsenc.c

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoconfigure: add noexecstack to linker options if supported.
Reimar Döffinger [Sun, 21 Sep 2014 08:58:10 +0000 (09:58 +0100)]
configure: add noexecstack to linker options if supported.

Signed-off-by: Reimar Döffinger <Reimar.Doeffinger@gmx.de>
(cherry picked from commit b7082d953fda93f7841ffffe7d15a6c3cd15bdee)

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoavcodec/ac3enc_template: fix out of array read
Michael Niedermayer [Sat, 27 Sep 2014 18:34:44 +0000 (20:34 +0200)]
avcodec/ac3enc_template: fix out of array read

Found-by: Andreas Cadhalpun
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
(cherry picked from commit d85ebea3f3b68ebccfe308fa839fc30fa634e4de)

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoavutil/x86/cpu: fix cpuid sub-leaf selection
lvqcl [Sat, 27 Sep 2014 11:21:31 +0000 (13:21 +0200)]
avutil/x86/cpu: fix cpuid sub-leaf selection

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
(cherry picked from commit e58fc44649d07d523fcd17aa10d9eb0d3a5ef3f4)

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoavformat/img2dec: enable generic seeking for image pipes
Michael Niedermayer [Thu, 25 Sep 2014 15:07:04 +0000 (17:07 +0200)]
avformat/img2dec: enable generic seeking for image pipes

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
(cherry picked from commit ce6e46be72292a748f37af50bfd5001dc5daa0e7)

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoavformat/img2dec: initialize pkt->pos for image pipes
Michael Niedermayer [Thu, 25 Sep 2014 15:06:33 +0000 (17:06 +0200)]
avformat/img2dec: initialize pkt->pos for image pipes

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
(cherry picked from commit 6d35aba167a2333367298fced3724b16261dcdf9)

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoavformat/img2dec: pass error code and signal EOF
Michael Niedermayer [Thu, 25 Sep 2014 14:17:08 +0000 (16:17 +0200)]
avformat/img2dec: pass error code and signal EOF

Found-by: Daemon404
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
(cherry picked from commit 2497914a1846c1dbcfb853ea834da0038f0e22f5)

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoavformat/img2dec: fix error code at EOF for pipes
Michael Niedermayer [Thu, 25 Sep 2014 13:12:27 +0000 (15:12 +0200)]
avformat/img2dec: fix error code at EOF for pipes

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
(cherry picked from commit 1dbdcb4a8c76df70ab41e3dacbfe01d59ed4091e)

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agolibavutil/opt: fix av_opt_set_channel_layout() to access correct memory address
Philip DeCamp [Wed, 24 Sep 2014 20:15:18 +0000 (16:15 -0400)]
libavutil/opt: fix av_opt_set_channel_layout() to access correct memory address

Signed-off-by: Philip DeCamp <decamp@mit.edu>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
(cherry picked from commit 857fc0a71f1b52fbba3281ba64b5a35195458622)

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agotests/fate-run.sh: Cat .err file in case of error with V>0
Michael Niedermayer [Tue, 23 Sep 2014 21:38:29 +0000 (23:38 +0200)]
tests/fate-run.sh: Cat .err file in case of error with V>0

This may make fate failures where only the console output is available
easier to analyze

Suggested-by: Andreas Cadhalpun
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
(cherry picked from commit 00d3bb1a074b60fd9687679e4147f56d81886b05)

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoavformat/riffenc: Filter out "BottomUp" in ff_put_bmp_header()
Benoit Fouet [Tue, 23 Sep 2014 08:07:10 +0000 (10:07 +0200)]
avformat/riffenc: Filter out "BottomUp" in ff_put_bmp_header()

Fixes Ticket1304

Commit message and extradata size bugfix by commiter
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
(cherry picked from commit 6843b9dc78bc966bb30121828ef4f6b6755cf877)

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoavcodec/webp: fix default palette color 0xff000000 -> 0x00000000
Pascal Massimino [Mon, 22 Sep 2014 21:48:57 +0000 (14:48 -0700)]
avcodec/webp: fix default palette color 0xff000000 -> 0x00000000

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
(cherry picked from commit e5b3112996c3da45aa03b39c5ade375d40d4407d)

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoavcodec/asvenc: fix AAN scaling
Michael Niedermayer [Tue, 23 Sep 2014 13:55:24 +0000 (15:55 +0200)]
avcodec/asvenc: fix AAN scaling

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
(cherry picked from commit b0f7de3e7c735cf6e222006ecbbd3e11b5f90a21)

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoFix compile error on arm4/arm5 platform
Bernd Kuhls [Tue, 23 Sep 2014 18:10:03 +0000 (20:10 +0200)]
Fix compile error on arm4/arm5 platform

Since these commits
http://git.videolan.org/?p=ffmpeg.git;a=commitdiff;h=adf8227cf4e7b4fccb2ad88e1e09b6dc00dd00ed
http://git.videolan.org/?p=ffmpeg.git;a=commitdiff;h=db7f1c7c5a1d37e7f4da64a79a97bea1c4b6e9f8

compilation on arm4/arm5 fails:

libavcodec/libavcodec.so: undefined reference to
`ff_startcode_find_candidate_armv6'

Because libavcodec/arm/Makefile contains
ARMV6-OBJS-$(CONFIG_STARTCODE)         += arm/startcode_armv6.o
function ff_startcode_find_candidate_armv6 is not included for older ARM
archs. The bug was found during automatic buildroot builds:

http://autobuild.buildroot.net/results/ec7/ec71e4f16ee9106747dff5f15999cbd17903e76f//build-end.log
Quote from configure summary:
ARCH                      arm (armv4t)
big-endian                no
runtime cpu detection     yes
ARMv5TE enabled           no
ARMv6 enabled             no
ARMv6T2 enabled           no

http://autobuild.buildroot.net/results/be7/be72eb182eaccf0064a32c9dfc2ac1c0d6555506/build-end.log
ARCH                      arm (armv5te)
big-endian                no
runtime cpu detection     yes
ARMv5TE enabled           yes
ARMv6 enabled             no
ARMv6T2 enabled           no

This patch provides the necessary #if clauses as discussed with Michael:
https://ffmpeg.org/pipermail/ffmpeg-devel/2014-September/163329.html

Signed-off-by: Bernd Kuhls <bernd.kuhls@t-online.de>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
(cherry picked from commit 6b733be755529f2472472d9ed1b2eef3b6398828)

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoChangelog: fix sws typo
Michael Niedermayer [Mon, 22 Sep 2014 07:11:38 +0000 (09:11 +0200)]
Changelog: fix sws typo

Found-by: Clément Bœsch <u@pkh.me>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoMerge commit 'ff24824a721576195c3b4a711e3ee2af900de795' into release/2.4
Michael Niedermayer [Sat, 4 Oct 2014 21:22:03 +0000 (23:22 +0200)]
Merge commit 'ff24824a721576195c3b4a711e3ee2af900de795' into release/2.4

* commit 'ff24824a721576195c3b4a711e3ee2af900de795':
  h264: reset ret to avoid propagating minor failures

See: 47048aa30b5c35fc8b030e819b9769b6bca03c08
Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoMerge commit '570cefb02b4f149c4263677e1a3eea216ee0ec8c' into release/2.4
Michael Niedermayer [Sat, 4 Oct 2014 21:20:50 +0000 (23:20 +0200)]
Merge commit '570cefb02b4f149c4263677e1a3eea216ee0ec8c' into release/2.4

* commit '570cefb02b4f149c4263677e1a3eea216ee0ec8c':
  hevc: Initialize mergecand_list to 0

Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoMerge commit 'ce0972ecddef3eee3c03e393108e5728821e3e37' into release/2.4
Michael Niedermayer [Sat, 4 Oct 2014 21:14:07 +0000 (23:14 +0200)]
Merge commit 'ce0972ecddef3eee3c03e393108e5728821e3e37' into release/2.4

* commit 'ce0972ecddef3eee3c03e393108e5728821e3e37':
  mpeg12: Always invoke the get_format() callback

Conflicts:
libavcodec/mpeg12dec.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoMerge commit '09c848855a7bf11a9ab4a69971cced260b17817d' into release/2.4
Michael Niedermayer [Sat, 4 Oct 2014 21:02:38 +0000 (23:02 +0200)]
Merge commit '09c848855a7bf11a9ab4a69971cced260b17817d' into release/2.4

* commit '09c848855a7bf11a9ab4a69971cced260b17817d':
  h264: Always invoke the get_format() callback

Conflicts:
libavcodec/h264_slice.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoMerge commit '9eb442cca23bb8d33b3e6d37b8c0e3afff04c37a' into release/2.4
Michael Niedermayer [Sat, 4 Oct 2014 21:01:31 +0000 (23:01 +0200)]
Merge commit '9eb442cca23bb8d33b3e6d37b8c0e3afff04c37a' into release/2.4

* commit '9eb442cca23bb8d33b3e6d37b8c0e3afff04c37a':
  Update default FATE URL for release/11

Conflicts:
tests/Makefile

no change, as we do not have per release reference samples

Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoh264: reset ret to avoid propagating minor failures
Michael Niedermayer [Sat, 27 Sep 2014 23:46:50 +0000 (00:46 +0100)]
h264: reset ret to avoid propagating minor failures

Unbreak 772d150a6e82542c06b0c251e73dd299d98d1027.

CC: libav-stable@libav.org
Bug-Id: 750 / 905753
Signed-off-by: Vittorio Giovara <vittorio.giovara@gmail.com>
5 years agohevc: Initialize mergecand_list to 0
Luca Barbato [Wed, 17 Sep 2014 17:51:40 +0000 (19:51 +0200)]
hevc: Initialize mergecand_list to 0

Unbreak cf6090dc6252f2b276aa4133e3d73a89f4c6046c.

CC: libav-stable@libav.org
Sample-Id: hevc-conformance-LTRPSPS_A_Qualcomm_1

5 years agompeg12: Always invoke the get_format() callback
Rémi Denis-Courmont [Thu, 25 Sep 2014 08:59:58 +0000 (11:59 +0300)]
mpeg12: Always invoke the get_format() callback

Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
5 years agoh264: Always invoke the get_format() callback
Rémi Denis-Courmont [Thu, 25 Sep 2014 08:59:57 +0000 (11:59 +0300)]
h264: Always invoke the get_format() callback

Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
5 years agoupdate for 2.4.1 n2.4.1
Michael Niedermayer [Sun, 21 Sep 2014 21:23:48 +0000 (23:23 +0200)]
update for 2.4.1

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoavfilter/vf_scale: Allow chroma samples to be above and to the left of luma samples
Michael Niedermayer [Sun, 21 Sep 2014 10:12:50 +0000 (12:12 +0200)]
avfilter/vf_scale: Allow chroma samples to be above and to the left of luma samples

Found-by: Kierank
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
(cherry picked from commit e927682e1b258501f3ddecef85801282267277c7)

Conflicts:

libavfilter/version.h

5 years agoswscale: Allow chroma samples to be above and to the left of luma samples
Michael Niedermayer [Sun, 21 Sep 2014 10:12:50 +0000 (12:12 +0200)]
swscale: Allow chroma samples to be above and to the left of luma samples

Found-by: Kierank
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
(cherry picked from commit 61af6bebb457c8d9bb00baaccd65a39632437bcd)

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoavcodec/libilbc: support for latest git of libilbc
Gianluigi Tiesi [Fri, 19 Sep 2014 02:49:36 +0000 (04:49 +0200)]
avcodec/libilbc: support for latest git of libilbc

in the latest git commits of libilbc developers removed WebRtc_xxx typedefs

This commit uses int types instead,
it's safe to apply also for previous versions since
WebRtc_Word16 was always a typedef of int16_t and
WebRtc_UWord16 a typedef of uint16_t

Reviewed-by: Timothy Gu <timothygu99@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
(cherry picked from commit 59af5383c18c8cf3fe2a4b5cc1ebf2f3300bdfe5)

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agolibavcodec/webp: treat out-of-bound palette index as translucent black
Pascal Massimino [Tue, 16 Sep 2014 15:01:07 +0000 (17:01 +0200)]
libavcodec/webp: treat out-of-bound palette index as translucent black

See https://code.google.com/p/webp/issues/detail?id=206
for a description of the problem/fix.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
This patch makes the decoder follow the recommendation of the spec.
There is some disagreement (see "[FFmpeg-devel] [PATCH]: libavcodec/webp")
about what would be best to be written in the spec, so in case the spec
is changed again, this potentially would need to be amended or reverted
(cherry picked from commit 4fd21d58a72c38ab63c3a4483b420db260fa7b8d)

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agovf_deshake: rename Transform.vector to Transform.vec to avoid compiler confusion
Andreas Cadhalpun [Wed, 17 Sep 2014 22:08:05 +0000 (00:08 +0200)]
vf_deshake: rename Transform.vector to Transform.vec to avoid compiler confusion

The token 'vector' is a keyword in the Vector/SIMD Multimedia Extension data types and thus should not be used as a variable name.

This fixes building on powerpc/ppc64el.

Signed-off-by: Andreas Cadhalpun <Andreas.Cadhalpun@googlemail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
(cherry picked from commit 739f179dd6a21f3fcbd3d23d3d14cde9bb587ead)

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoavcodec/x86/vp9lpf: Always include x86util.asm
Michael Niedermayer [Wed, 17 Sep 2014 21:36:53 +0000 (23:36 +0200)]
avcodec/x86/vp9lpf: Always include x86util.asm

Fixes executable stack

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
(cherry picked from commit 41d82b85ab0ee8bb2931c1f783e30c38c2fb5206)

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoMerge commit 'b45ab61b24a8f2aeafdd4451491b1b30b7875ee5' into release/2.4
Michael Niedermayer [Wed, 17 Sep 2014 23:04:20 +0000 (01:04 +0200)]
Merge commit 'b45ab61b24a8f2aeafdd4451491b1b30b7875ee5' into release/2.4

* commit 'b45ab61b24a8f2aeafdd4451491b1b30b7875ee5':
  apetag: Fix APE tag size check

Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoUpdate default FATE URL for release/11
Diego Biurrun [Wed, 17 Sep 2014 14:08:57 +0000 (07:08 -0700)]
Update default FATE URL for release/11

5 years agoapetag: Fix APE tag size check
Katerina Barone-Adesi [Mon, 15 Sep 2014 23:40:24 +0000 (01:40 +0200)]
apetag: Fix APE tag size check

The size variable is (correctly) unsigned, but is passed to several functions
which take signed parameters, such as avio_read, sometimes after having
numbers added to it. So ensure that size remains within the bounds that
these functions can handle.

(cherry picked from commit c5560e72d0bb69f8a1ac9536570398f84388f396)
Signed-off-by: Diego Biurrun <diego@biurrun.de>
5 years agotools/crypto_bench: fix build when AV_READ_TIME is unavailable
Michael Niedermayer [Tue, 16 Sep 2014 16:04:51 +0000 (18:04 +0200)]
tools/crypto_bench: fix build when AV_READ_TIME is unavailable

Found-by: Andreas Cadhalpun <andreas.cadhalpun@googlemail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
(cherry picked from commit 4a99134f1a71994a0dc4542a0d6bee8e36146b60)

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoRELEASE_NOTES: add H.261 & HEVC RTP support
Michael Niedermayer [Tue, 16 Sep 2014 09:34:50 +0000 (11:34 +0200)]
RELEASE_NOTES: add H.261 & HEVC RTP support

Suggested-by: Thomas Volkert <silvo@gmx.net>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoavcodec/mjpegenc: the AMV encoder doesnt support yuv422 n2.4
Michael Niedermayer [Sun, 14 Sep 2014 15:09:38 +0000 (17:09 +0200)]
avcodec/mjpegenc: the AMV encoder doesnt support yuv422

Fixes Ticket3883

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
(cherry picked from commit b227be34db76541db0269a769dad90c20793353f)

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoChangelog: add 2.4
Michael Niedermayer [Sun, 14 Sep 2014 14:47:26 +0000 (16:47 +0200)]
Changelog: add 2.4

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
(cherry picked from commit 808db3e68778b77e020aab1b838d32e63a38ae63)

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agodoc/examples: remove unneeded NULL checks
Michael Niedermayer [Fri, 15 Aug 2014 22:27:14 +0000 (00:27 +0200)]
doc/examples: remove unneeded NULL checks

dst_file cannot be NULL

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
(cherry picked from commit 68bca03951b36755f46d75a5bcfcbba95ced21c4)

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoMAINTAINERS: Add 2.4 to maintained releases, drop 2.3
Michael Niedermayer [Sun, 14 Sep 2014 10:54:01 +0000 (12:54 +0200)]
MAINTAINERS: Add 2.4 to maintained releases, drop 2.3

2.2 is used by 4 distributions, 2.3 by none, thus continuing maintaining
2.2 makes more sense than 2.3 see:
https://trac.ffmpeg.org/wiki/Downstreams

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
(cherry picked from commit da2186be81b5cb2d24da5671e25affbb8f09920d)

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoMerge commit 'f851477889ae48e2f17073cf7486e1d5561b7ae4' into release/2.4
Michael Niedermayer [Sun, 14 Sep 2014 13:45:56 +0000 (15:45 +0200)]
Merge commit 'f851477889ae48e2f17073cf7486e1d5561b7ae4' into release/2.4

* commit 'f851477889ae48e2f17073cf7486e1d5561b7ae4': (26 commits)
  Prepare for 11 release
  doc: Fix syntax and logical errors in avconv stream combination example
  Fix RELEASE identification
  Mark 11 release in the changelog
  Add release notes for 11.
  avcodec: fix missing doxygen comment marker
  Prepare for 11_beta2 Release
  license: Mention that vf_interlace is GPL, not LGPL
  matroskaenc: convert avstream stereo3d side data during encoding
  matroskadec: parse stereo mode on decoding
  avcodec: add stream-level stereo3d side data
  matroska: list supported extensions
  doc/APIchanges: fill in missing hashes and dates
  pulse: Add a wallclock option to be compatible with other other captures
  vc1: Initialize start_code_found to 0
  avconv: fix parsing the AVOptions for -target
  avconv: fix the muxrate values for -target
  mpegenc: limit the maximum muxrate
  vc1: Fix the skip condition
  vfwcap: Add fallback define for HWND_MESSAGE
  ...

Conflicts:
Changelog
LICENSE.md
RELEASE
doc/APIchanges
doc/RELEASE_NOTES
doc/ffmpeg.texi
ffmpeg_opt.c
libavcodec/avcodec.h
libavcodec/error_resilience.c
libavcodec/utils.c
libavcodec/vc1_parser.c
libavcodec/version.h
libavdevice/pulse_audio_dec.c
libavfilter/setpts.c
libavfilter/src_movie.c
libavformat/electronicarts.c
libavformat/matroska.c
libavformat/matroskadec.c
libavformat/matroskaenc.c
libavformat/mpegenc.c

Merge for metadata only, all these backports are already present in
release/2.4 as its branched off from master at a later point so that
all these changes where in master already.

Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoupdate for 2.4
Michael Niedermayer [Sun, 14 Sep 2014 13:37:11 +0000 (15:37 +0200)]
update for 2.4

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoChangelog/RELEASE_NOTES: prepare for 2.4
Clément Bœsch [Sun, 14 Sep 2014 06:32:46 +0000 (08:32 +0200)]
Changelog/RELEASE_NOTES: prepare for 2.4

5 years agodoc/APIchanges: Update hashes and dates
Michael Niedermayer [Sun, 14 Sep 2014 10:45:36 +0000 (12:45 +0200)]
doc/APIchanges: Update hashes and dates

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agodoc/APIchanges: attempt to split releases
Clément Bœsch [Sun, 14 Sep 2014 06:56:02 +0000 (08:56 +0200)]
doc/APIchanges: attempt to split releases

Based on several git show origin/release/X.Y:doc/APIchanges.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agodoc: mention important API changes in the RELEASE_NOTES
Andreas Cadhalpun [Sun, 14 Sep 2014 00:08:08 +0000 (02:08 +0200)]
doc: mention important API changes in the RELEASE_NOTES

Signed-off-by: Andreas Cadhalpun <Andreas.Cadhalpun@googlemail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoffserver: drop custom skip_spaces() impl
Reynaldo H. Verdejo Pinochet [Sat, 13 Sep 2014 23:52:03 +0000 (20:52 -0300)]
ffserver: drop custom skip_spaces() impl

Signed-off-by: Reynaldo H. Verdejo Pinochet <reynaldo@osg.samsung.com>
5 years agoffserver: use correct error for stream not found
Reynaldo H. Verdejo Pinochet [Sat, 13 Sep 2014 22:05:04 +0000 (19:05 -0300)]
ffserver: use correct error for stream not found

Signed-off-by: Reynaldo H. Verdejo Pinochet <reynaldo@osg.samsung.com>
5 years agodoc: mention in APIChanges that AVProbeData must be initialized due to the new mime_t...
Andreas Cadhalpun [Sat, 13 Sep 2014 22:52:42 +0000 (00:52 +0200)]
doc: mention in APIChanges that AVProbeData must be initialized due to the new mime_type field

Signed-off-by: Andreas Cadhalpun <Andreas.Cadhalpun@googlemail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoRELEASE_NOTES: add version numbers
Michael Niedermayer [Sat, 13 Sep 2014 22:14:58 +0000 (00:14 +0200)]
RELEASE_NOTES: add version numbers

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoRELEASE_NOTES: Add next versions name (Fresnel)
Michael Niedermayer [Sat, 13 Sep 2014 21:43:20 +0000 (23:43 +0200)]
RELEASE_NOTES: Add next versions name (Fresnel)

The name is "randomly" picked from previous suggestions
If people prefer something else, suggest it quickly

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoavformat/utils: free s->pb for image2 as it can be used with and without a file
Michael Niedermayer [Sat, 13 Sep 2014 20:56:05 +0000 (22:56 +0200)]
avformat/utils: free s->pb for image2 as it can be used with and without a file

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoavformat/assenc: honor ReadOrder
Clément Bœsch [Sat, 13 Sep 2014 19:06:16 +0000 (21:06 +0200)]
avformat/assenc: honor ReadOrder

5 years agoavdevice/lavfi: dont assign variables to themselfs
Michael Niedermayer [Tue, 9 Sep 2014 19:12:08 +0000 (21:12 +0200)]
avdevice/lavfi: dont assign variables to themselfs

Fixes "warning: explicitly assigning a variable of type int to itself"

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoFix "passing argument 1 of av_free discards const qualifier from pointer target type"
Michael Niedermayer [Tue, 9 Sep 2014 19:07:58 +0000 (21:07 +0200)]
Fix "passing argument 1 of av_free discards const qualifier from pointer target type"

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoavformat/mpegts: Improve probe heuristic by considering the overall frequency of...
Michael Niedermayer [Sat, 13 Sep 2014 20:08:21 +0000 (22:08 +0200)]
avformat/mpegts: Improve probe heuristic by considering the overall frequency of 0x47 headers

Fixes Ticket3939

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoavcodec/mjpegdec: Fix chroma width rounding
Clément Bœsch [Sat, 13 Sep 2014 18:25:27 +0000 (20:25 +0200)]
avcodec/mjpegdec: Fix chroma width rounding

Fixes vertical line at the right side
Fixes Ticket 3929

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoPrepare for 11 release
Diego Biurrun [Sat, 13 Sep 2014 18:14:46 +0000 (11:14 -0700)]
Prepare for 11 release

5 years agoavcodec/bmp_parser: delay frame end detection to the next header or EOF
Michael Niedermayer [Sat, 13 Sep 2014 15:46:18 +0000 (17:46 +0200)]
avcodec/bmp_parser: delay frame end detection to the next header or EOF

Fixes Ticket3687

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoavcodec/bmp_parser: simplify
Michael Niedermayer [Sat, 13 Sep 2014 15:21:31 +0000 (17:21 +0200)]
avcodec/bmp_parser: simplify

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoavcodec/bmp_parser: fix parsing a single bmp which has a fsize < its header
Michael Niedermayer [Sat, 13 Sep 2014 14:43:27 +0000 (16:43 +0200)]
avcodec/bmp_parser: fix parsing a single bmp which has a fsize < its header

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoavformat/vobsub: fix NULL dereference
Clément Bœsch [Sat, 13 Sep 2014 13:15:32 +0000 (15:15 +0200)]
avformat/vobsub: fix NULL dereference

5 years agoavcodec/ac3en: use FF_ALLOC(Z)_ARRAY()
Michael Niedermayer [Sat, 13 Sep 2014 11:28:38 +0000 (13:28 +0200)]
avcodec/ac3en: use FF_ALLOC(Z)_ARRAY()

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agolavf/format.c: use AVPROBE_SCORE_MIME instead of AVPROBE_SCORE_EXTENSION for matching...
Andreas Cadhalpun [Fri, 12 Sep 2014 16:20:08 +0000 (18:20 +0200)]
lavf/format.c: use AVPROBE_SCORE_MIME instead of AVPROBE_SCORE_EXTENSION for matching mime types

Signed-off-by: Andreas Cadhalpun <Andreas.Cadhalpun@googlemail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agodoc: document the addition of the AVProbeData.mime_type field and it's implications
Andreas Cadhalpun [Fri, 12 Sep 2014 16:18:42 +0000 (18:18 +0200)]
doc: document the addition of the AVProbeData.mime_type field and it's implications

Signed-off-by: Andreas Cadhalpun <Andreas.Cadhalpun@googlemail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoconfigure: Fix miscompilation for i586
Mikulas Patocka [Fri, 12 Sep 2014 20:29:29 +0000 (22:29 +0200)]
configure: Fix miscompilation for i586

If the CPU is 386, 486 or pentium, we must not use cmov in inline
assembler.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoavformat/img2dec: Fail probing when no data is yet available and the filename contain...
Michael Niedermayer [Thu, 11 Sep 2014 14:48:03 +0000 (16:48 +0200)]
avformat/img2dec: Fail probing when no data is yet available and the filename contains no number/glob patterns either.

Fixes Ticket3901

the seek test error codes change due to a change in the failure path,
this could be avoided by changing the respective error codes to EINVAL

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoavformat/format: Run image2 probe again when file content data is available
Michael Niedermayer [Thu, 11 Sep 2014 14:48:02 +0000 (16:48 +0200)]
avformat/format: Run image2 probe again when file content data is available

Reviewed-by: Benoit Fouet <benoit.fouet@free.fr>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoavformat/img2dec: reduce bmppipe probe score
Michael Niedermayer [Thu, 11 Sep 2014 14:48:01 +0000 (16:48 +0200)]
avformat/img2dec: reduce bmppipe probe score

bmp pipe needs the bmp parser which is not bug free and should thus not be favored
over the bmp image2 demuxer
that also means this change could be reverted in case bmp pipe is improved so it
handles all single bmp images correctly

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agodocs: add example around the suggested commit message format
James Darnley [Thu, 11 Sep 2014 23:31:26 +0000 (01:31 +0200)]
docs: add example around the suggested commit message format

It gets rendered inline in HTML and becomes not very clear.

Reviewed-by: Timothy Gu <timothygu99@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoconfigure: fix check_cmd in check_host_cpp
Jörg Krause [Thu, 11 Sep 2014 11:55:48 +0000 (13:55 +0200)]
configure: fix check_cmd in check_host_cpp

Use correct cpp and c flags variables for the host libc.

Signed-off-by: Jörg Krause <jkrause@posteo.de>
Reviewed-by: Benoit Fouet <benoit.fouet@free.fr>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoavutil/ppc/float_dsp_altivec: ppc: Fix bug in ff_vector_fmul_add_altivec() affecting...
Rong Yan [Thu, 11 Sep 2014 09:07:40 +0000 (09:07 +0000)]
avutil/ppc/float_dsp_altivec: ppc: Fix bug in ff_vector_fmul_add_altivec() affecting little endian environments on POWER8

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoavcodec/png_parser: Return the buffered data at the end
Michael Niedermayer [Thu, 11 Sep 2014 14:40:25 +0000 (16:40 +0200)]
avcodec/png_parser: Return the buffered data at the end

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoavcodec/pngdec: print the actual number of bytes left in the error case
Michael Niedermayer [Thu, 11 Sep 2014 14:15:02 +0000 (16:15 +0200)]
avcodec/pngdec: print the actual number of bytes left in the error case

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoavformat/img2_alias_pix: Add AVClass and image2 AVOptions
Michael Niedermayer [Thu, 11 Sep 2014 13:34:13 +0000 (15:34 +0200)]
avformat/img2_alias_pix: Add AVClass and image2 AVOptions

This fixes the default timebase and allows overriding the framerate

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoavformat/img2_alias & brender_pix: fix function names
Michael Niedermayer [Thu, 11 Sep 2014 13:16:24 +0000 (15:16 +0200)]
avformat/img2_alias & brender_pix: fix function names

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoavformat/img2_brender_pix: Add AVClass and image2 AVOptions
Michael Niedermayer [Thu, 11 Sep 2014 13:10:59 +0000 (15:10 +0200)]
avformat/img2_brender_pix: Add AVClass and image2 AVOptions

This fixes the default timebase and allows overriding the framerate

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoavformat/img2: Make AVOptions available to img* demuxers defined in other files
Michael Niedermayer [Thu, 11 Sep 2014 13:10:15 +0000 (15:10 +0200)]
avformat/img2: Make AVOptions available to img* demuxers defined in other files

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoavformat/rmdec: very basic MLTI support
Michael Niedermayer [Mon, 8 Sep 2014 22:46:44 +0000 (00:46 +0200)]
avformat/rmdec: very basic MLTI support

Fixes Ticket2152

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoffmpeg: Do av_buffersink_set_frame_size() when reconfiguring the filtergraph not...
Michael Niedermayer [Thu, 11 Sep 2014 02:55:58 +0000 (04:55 +0200)]
ffmpeg: Do av_buffersink_set_frame_size() when reconfiguring the filtergraph not just when changing audio resample parameters

Fixes Ticket3562

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoMerge commit '775a0b04f0cf8102fe322b2ee03fe1a0633dea04'
Michael Niedermayer [Wed, 10 Sep 2014 23:26:31 +0000 (01:26 +0200)]
Merge commit '775a0b04f0cf8102fe322b2ee03fe1a0633dea04'

* commit '775a0b04f0cf8102fe322b2ee03fe1a0633dea04':
  doc: Fix syntax and logical errors in avconv stream combination example

Conflicts:
doc/ffmpeg.texi

Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoavcodec/h264: Use FF_ALLOCZ_ARRAY_OR_GOTO()
Michael Niedermayer [Wed, 10 Sep 2014 20:35:41 +0000 (22:35 +0200)]
avcodec/h264: Use FF_ALLOCZ_ARRAY_OR_GOTO()

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoavcodec/dnxhdenc: Use FF_ALLOCZ_ARRAY_OR_GOTO()
Michael Niedermayer [Wed, 10 Sep 2014 20:29:14 +0000 (22:29 +0200)]
avcodec/dnxhdenc: Use FF_ALLOCZ_ARRAY_OR_GOTO()

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agodoc: Fix syntax and logical errors in avconv stream combination example
Diego Biurrun [Wed, 10 Sep 2014 16:38:15 +0000 (18:38 +0200)]
doc: Fix syntax and logical errors in avconv stream combination example

Bug-Id: 661
CC: libav-stable@libav.org
(cherry picked from commit 775a0b04f0cf8102fe322b2ee03fe1a0633dea04)
Signed-off-by: Diego Biurrun <diego@biurrun.de>
5 years agoavcodec/mpegvideo: Use FF_ALLOCZ_ARRAY_OR_GOTO()
Michael Niedermayer [Wed, 10 Sep 2014 18:50:32 +0000 (20:50 +0200)]
avcodec/mpegvideo: Use FF_ALLOCZ_ARRAY_OR_GOTO()

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoavcodec/twinvq: Use FF_ALLOC_ARRAY_OR_GOTO()
Michael Niedermayer [Wed, 10 Sep 2014 18:44:19 +0000 (20:44 +0200)]
avcodec/twinvq: Use FF_ALLOC_ARRAY_OR_GOTO()

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agodoc: Fix syntax and logical errors in avconv stream combination example
Diego Biurrun [Wed, 10 Sep 2014 16:38:15 +0000 (18:38 +0200)]
doc: Fix syntax and logical errors in avconv stream combination example

Bug-Id: 661
CC: libav-stable@libav.org
5 years agoavcodec/aacenc: Use FF_ALLOCZ_ARRAY_OR_GOTO()
Michael Niedermayer [Wed, 10 Sep 2014 13:06:44 +0000 (15:06 +0200)]
avcodec/aacenc: Use FF_ALLOCZ_ARRAY_OR_GOTO()

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoavcodec/ac3enc_template: Use FF_ALLOC_ARRAY_OR_GOTO()
Michael Niedermayer [Wed, 10 Sep 2014 13:06:28 +0000 (15:06 +0200)]
avcodec/ac3enc_template: Use FF_ALLOC_ARRAY_OR_GOTO()

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoavcodec/adpcmenc: Use FF_ALLOC_ARRAY_OR_GOTO()
Michael Niedermayer [Wed, 10 Sep 2014 12:37:12 +0000 (14:37 +0200)]
avcodec/adpcmenc: Use FF_ALLOC_ARRAY_OR_GOTO()

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoavformat/concatdec: fix "warning: explicitly assigning a variable of type int to...
Michael Niedermayer [Tue, 9 Sep 2014 23:22:57 +0000 (01:22 +0200)]
avformat/concatdec: fix "warning: explicitly assigning a variable of type int to itself"

Reviewed-by: Nicolas George <george@nsup.org>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>