ffmpeg.git
5 years agoUpdate for 2.2.3 n2.2.3
Michael Niedermayer [Mon, 2 Jun 2014 21:08:27 +0000 (23:08 +0200)]
Update for 2.2.3

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoavformat/h263dec/h263_probe: Check TR
Michael Niedermayer [Wed, 7 May 2014 01:41:41 +0000 (03:41 +0200)]
avformat/h263dec/h263_probe: Check TR

Fixes missdetection of Misdetection_345.mp3
Fixes missdetection of Misdetection_421.mp3
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
(cherry picked from commit cd20b93e2f5171054d6b3dd9daee1e832c1f9090)

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoavformat/h263dec/h263_probe: Check PSC bit 9 and 13 in
Michael Niedermayer [Wed, 7 May 2014 01:20:13 +0000 (03:20 +0200)]
avformat/h263dec/h263_probe: Check PSC bit 9 and 13 in

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

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoavformat/h263dec: shift data in state to make more bits available to probe
Michael Niedermayer [Wed, 7 May 2014 01:12:34 +0000 (03:12 +0200)]
avformat/h263dec: shift data in state to make more bits available to probe

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

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoavcodec/svq3: Fix "incompatible pointer type" warnings
Michael Niedermayer [Mon, 5 May 2014 21:30:35 +0000 (23:30 +0200)]
avcodec/svq3: Fix "incompatible pointer type" warnings

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

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoavformat/utils: Call ff_rfps_add_frame() only for video
Michael Niedermayer [Mon, 2 Jun 2014 15:09:53 +0000 (17:09 +0200)]
avformat/utils: Call ff_rfps_add_frame() only for video

This avoids some unneeded computations

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

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoavformat/flvenc: fix assertion failure after 4h muxing
Michael Niedermayer [Fri, 30 May 2014 23:43:41 +0000 (01:43 +0200)]
avformat/flvenc: fix assertion failure after 4h muxing

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

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoavcodec/mss4: Fix () in MKVAL() macro
Michael Niedermayer [Sun, 25 May 2014 03:19:09 +0000 (05:19 +0200)]
avcodec/mss4: Fix () in MKVAL() macro

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

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoavcodec/mss34dsp: fix () in SOP* macros
Michael Niedermayer [Sun, 25 May 2014 03:18:47 +0000 (05:18 +0200)]
avcodec/mss34dsp: fix () in SOP* macros

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

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoavcodec/mlpdec: fix () in MSB_MASK() macro
Michael Niedermayer [Sun, 25 May 2014 03:17:51 +0000 (05:17 +0200)]
avcodec/mlpdec: fix () in MSB_MASK() macro

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

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoavcodec/ivi_dsp: add some missing () to macros
Michael Niedermayer [Sun, 25 May 2014 01:39:08 +0000 (03:39 +0200)]
avcodec/ivi_dsp: add some missing () to macros

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

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoavcodec/hevc: fix () in macros
Michael Niedermayer [Sun, 25 May 2014 01:36:03 +0000 (03:36 +0200)]
avcodec/hevc: fix () in macros

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

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoavcodec/h264: fix () in macros
Michael Niedermayer [Sun, 25 May 2014 01:30:13 +0000 (03:30 +0200)]
avcodec/h264: fix () in macros

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

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoavcodec/golomb-test: fix () in EXTEND() macro
Michael Niedermayer [Sun, 25 May 2014 01:27:56 +0000 (03:27 +0200)]
avcodec/golomb-test: fix () in EXTEND() macro

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

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoavcodec/aac: fix () in IS_CODEBOOK_UNSIGNED macro
Michael Niedermayer [Sun, 25 May 2014 01:19:47 +0000 (03:19 +0200)]
avcodec/aac: fix () in IS_CODEBOOK_UNSIGNED macro

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

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoavcodec/libvorbisenc: dont add the duration to AV_NOPTS_VALUE
Michael Niedermayer [Wed, 21 May 2014 01:02:06 +0000 (03:02 +0200)]
avcodec/libvorbisenc: dont add the duration to AV_NOPTS_VALUE

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

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoavutil/cpu: force mmx on selection of higher x86 SIMD features
Michael Niedermayer [Tue, 20 May 2014 03:23:52 +0000 (05:23 +0200)]
avutil/cpu: force mmx on selection of higher x86 SIMD features

Fixes various runtime failures with manually set flags that represent no
existing CPU

Fixes Ticket3653

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

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoavcodec/diracdec: move mc buffer allocation to per frame
Michael Niedermayer [Mon, 19 May 2014 04:19:23 +0000 (06:19 +0200)]
avcodec/diracdec: move mc buffer allocation to per frame

Fixes out of array accesses for non default buffers with large strides

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

5 years agoMerge commit '0ec75a04e5fc714bc3cd6e2a6b783e6df834ad01' into release/2.2
Michael Niedermayer [Mon, 2 Jun 2014 20:34:18 +0000 (22:34 +0200)]
Merge commit '0ec75a04e5fc714bc3cd6e2a6b783e6df834ad01' into release/2.2

* commit '0ec75a04e5fc714bc3cd6e2a6b783e6df834ad01':
  ppc: Fix compilation for ppc64le (ELFv2)
  aarch64: Use the correct syntax for relocations

Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoavformat/mov: allow seeking back to the begin even if nothing is marked as keyframe
Michael Niedermayer [Sun, 25 May 2014 23:23:16 +0000 (01:23 +0200)]
avformat/mov: allow seeking back to the begin even if nothing is marked as keyframe

Fixes Ticket 3663

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

5 years agoFix spelling error 'Inconsistant -> Inconsistent'
Andreas Cadhalpun [Thu, 6 Mar 2014 18:03:07 +0000 (19:03 +0100)]
Fix spelling error 'Inconsistant -> Inconsistent'

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

5 years agoFix spelling errors in texi files: accomodate -> accommodate allows to -> allows...
Andreas Cadhalpun [Thu, 6 Mar 2014 18:07:53 +0000 (19:07 +0100)]
Fix spelling errors in texi files: accomodate -> accommodate allows to -> allows one to choosen -> chosen compability -> compatibility explictly -> explicitly overriden -> overridden specifed -> specified Trasmission -> Transmission

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

5 years agoCorrect the FSF address for two avisynth files to '51 Franklin Street, Fifth Floor...
Andreas Cadhalpun [Thu, 6 Mar 2014 17:58:04 +0000 (18:58 +0100)]
Correct the FSF address for two avisynth files to '51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA'

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

5 years agoImprove the detection of architecture x86.
Andreas Cadhalpun [Mon, 26 May 2014 16:07:55 +0000 (18:07 +0200)]
Improve the detection of architecture x86.

This fixes building on Debian GNU/Hurd.

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

5 years agoppc: Fix compilation for ppc64le (ELFv2)
Thierry Fauck [Thu, 29 May 2014 12:22:27 +0000 (15:22 +0300)]
ppc: Fix compilation for ppc64le (ELFv2)

CC: libav-stable@libav.org
Signed-off-by: Martin Storsjö <martin@martin.st>
(cherry picked from commit d6d767d93e532246cacf3567e6bcad76a821f838)
Signed-off-by: Martin Storsjö <martin@martin.st>
5 years agoaarch64: Use the correct syntax for relocations
Martin Storsjö [Thu, 29 May 2014 11:37:31 +0000 (14:37 +0300)]
aarch64: Use the correct syntax for relocations

This fixes building in PIC mode with gas. The examples in the gas
manual showed using a # here even though gas itself actually didn't
support that syntax (and the gas test suite only tests it without
the extra hash sign).

CC: libav-stable@libav.org
Signed-off-by: Martin Storsjö <martin@martin.st>
(cherry picked from commit 08cd92144e73195eecc28ed0348e66e255516b82)
Signed-off-by: Martin Storsjö <martin@martin.st>
5 years agoffprobe: fix crash happening because of new streams occuring
Anshul [Wed, 14 May 2014 16:51:58 +0000 (22:21 +0530)]
ffprobe: fix crash happening because of new streams occuring

Fix trac ticket #3603.

Signed-off-by: Stefano Sabatini <stefasab@gmail.com>
(cherry picked from commit 73a60633143b7c51333a0772b45a47282ac445b6)

5 years agoUse Matroska document version 2 for WebM files if possible.
Carl Eugen Hoyos [Mon, 12 May 2014 16:12:28 +0000 (18:12 +0200)]
Use Matroska document version 2 for WebM files if possible.

Google's plugin for the Internet Explorer refuses to play
files with another document version.

Fixes ticket #3583.
(cherry picked from commit ab21acecc72a0299895583cf83347ab5e2444b71)

5 years agoavformat/avidec: remove unused variables
Michael Niedermayer [Wed, 2 Apr 2014 17:04:58 +0000 (19:04 +0200)]
avformat/avidec: remove unused variables

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

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoMerge commit 'e780c3daafe0588e035e752c771ebfcd2201746a' into release/2.2
Michael Niedermayer [Sun, 11 May 2014 16:10:27 +0000 (18:10 +0200)]
Merge commit 'e780c3daafe0588e035e752c771ebfcd2201746a' into release/2.2

* commit 'e780c3daafe0588e035e752c771ebfcd2201746a':
  pcm-dvd: Fix 20bit decoding

Conflicts:
Changelog

See: 5db49fc38d9132e134de92584f296559bec3b789
Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoMerge commit '7f954ca502a16feeca44d4e9a7d450b404dabc94' into release/2.2
Michael Niedermayer [Sun, 11 May 2014 15:59:58 +0000 (17:59 +0200)]
Merge commit '7f954ca502a16feeca44d4e9a7d450b404dabc94' into release/2.2

* commit '7f954ca502a16feeca44d4e9a7d450b404dabc94':
  avi: Improve non-interleaved detection

Conflicts:
Changelog
libavformat/avidec.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoavformat/avidec: Check required demuxing buffer sizes in guess_ni_flag()
Michael Niedermayer [Tue, 11 Mar 2014 18:18:23 +0000 (19:18 +0100)]
avformat/avidec: Check required demuxing buffer sizes in guess_ni_flag()

Fixes Ticket3421

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

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoMerge commit '8e9e57ed0c7f40741da1ca83e52c851263e0c168' into release/2.2
Michael Niedermayer [Sun, 11 May 2014 15:31:57 +0000 (17:31 +0200)]
Merge commit '8e9e57ed0c7f40741da1ca83e52c851263e0c168' into release/2.2

* commit '8e9e57ed0c7f40741da1ca83e52c851263e0c168':
  Update Changelog

Conflicts:
Changelog

Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoMerge commit '1bd6372cd34935815c0a061adbf3bc68ca68ff73' into release/2.2
Michael Niedermayer [Sun, 11 May 2014 15:31:20 +0000 (17:31 +0200)]
Merge commit '1bd6372cd34935815c0a061adbf3bc68ca68ff73' into release/2.2

* commit '1bd6372cd34935815c0a061adbf3bc68ca68ff73':
  arm: hpeldsp: fix put_pixels8_y2_{,no_rnd_}armv6

Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoMerge commit '40ffa99dfa39c574d8784a3c4eaf6406198d675d' into release/2.2
Michael Niedermayer [Sun, 11 May 2014 15:24:38 +0000 (17:24 +0200)]
Merge commit '40ffa99dfa39c574d8784a3c4eaf6406198d675d' into release/2.2

* commit '40ffa99dfa39c574d8784a3c4eaf6406198d675d':
  arm: hpeldsp: prevent overreads in armv6 asm

Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoMerge commit 'ff79f6b35a94dde69b3d52bd2abdfdb793f525c3' into release/2.2
Michael Niedermayer [Sun, 11 May 2014 15:10:07 +0000 (17:10 +0200)]
Merge commit 'ff79f6b35a94dde69b3d52bd2abdfdb793f525c3' into release/2.2

* commit 'ff79f6b35a94dde69b3d52bd2abdfdb793f525c3':
  avfilter: Add missing emms_c when needed

Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoMerge commit 'e2a83d72da866a29f5307a56f66c469966f02473' into release/2.2
Michael Niedermayer [Sun, 11 May 2014 15:09:47 +0000 (17:09 +0200)]
Merge commit 'e2a83d72da866a29f5307a56f66c469966f02473' into release/2.2

* commit 'e2a83d72da866a29f5307a56f66c469966f02473':
  Update Changelog for v10.1

Conflicts:
Changelog

Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoMerge commit '6c3985713b77c5c1155f31c3fbb8236f9b4cdfb5' into release/2.2
Michael Niedermayer [Sun, 11 May 2014 15:03:53 +0000 (17:03 +0200)]
Merge commit '6c3985713b77c5c1155f31c3fbb8236f9b4cdfb5' into release/2.2

* commit '6c3985713b77c5c1155f31c3fbb8236f9b4cdfb5':
  Add missing changelog entries for v10

Conflicts:
Changelog

Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoMerge commit '7d97cc8d87ebf6ebe7ec1865d6f932c652dbce3a' into release/2.2
Michael Niedermayer [Sun, 11 May 2014 15:02:10 +0000 (17:02 +0200)]
Merge commit '7d97cc8d87ebf6ebe7ec1865d6f932c652dbce3a' into release/2.2

* commit '7d97cc8d87ebf6ebe7ec1865d6f932c652dbce3a':
  rtmpproto: Check the buffer sizes when copying app/playpath strings

Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoMerge commit 'a56a9e65c6a17dd8b6303dd45bdc3e3368093092' into release/2.2
Michael Niedermayer [Sun, 11 May 2014 14:44:08 +0000 (16:44 +0200)]
Merge commit 'a56a9e65c6a17dd8b6303dd45bdc3e3368093092' into release/2.2

* commit 'a56a9e65c6a17dd8b6303dd45bdc3e3368093092':
  swscale: Fix an undefined behaviour

Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoMerge commit '428b629eb28907738ae98331b9f6c25cc9a8f3c8' into release/2.2
Michael Niedermayer [Sun, 11 May 2014 14:41:41 +0000 (16:41 +0200)]
Merge commit '428b629eb28907738ae98331b9f6c25cc9a8f3c8' into release/2.2

* commit '428b629eb28907738ae98331b9f6c25cc9a8f3c8':
  vp9: Read the frame size as unsigned

Conflicts:
libavcodec/vp9.c

See: c72f587353d9f88c7fbbbf6ef78b1d9ba3d38fd7
Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoMerge commit '194d12345d86c15b20b7e44a3679c9df3075d7f6' into release/2.2
Michael Niedermayer [Sun, 11 May 2014 14:23:49 +0000 (16:23 +0200)]
Merge commit '194d12345d86c15b20b7e44a3679c9df3075d7f6' into release/2.2

* commit '194d12345d86c15b20b7e44a3679c9df3075d7f6':
  dcadec: Use correct channel count in stereo downmix check

Conflicts:
libavcodec/dcadec.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoMerge commit 'b3d8276d2dc913d708d187fb15f6e98869d00500' into release/2.2
Michael Niedermayer [Sun, 11 May 2014 14:23:29 +0000 (16:23 +0200)]
Merge commit 'b3d8276d2dc913d708d187fb15f6e98869d00500' into release/2.2

* commit 'b3d8276d2dc913d708d187fb15f6e98869d00500':
  dcadec: Do not decode the XCh extension when downmixing to stereo

Conflicts:
libavcodec/dcadec.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agopcm-dvd: Fix 20bit decoding
nu774 [Fri, 9 May 2014 12:47:41 +0000 (21:47 +0900)]
pcm-dvd: Fix 20bit decoding

Increment the pointer as needed.

Bug-Id: 592

Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
(cherry picked from commit 9880a0d4b131ef36694d62f78060350a81f08b80)
Signed-off-by: Reinhard Tartler <siretart@tauware.de>
5 years agoavi: Improve non-interleaved detection
Michael Niedermayer [Wed, 2 Apr 2014 07:11:10 +0000 (09:11 +0200)]
avi: Improve non-interleaved detection

Additional fixes by Nigel Touati-Evans <nigel.touatievans@gmail.com>.

Check the index for streams with a time drift of 2s or a buffer drift
of 64MB.

Bug-Id: 666
CC: libav-stable@libav.org
Sample-Id: yet-another-broken-interleaved-avi.avi

Signed-off-by: Vittorio Giovara <vittorio.giovara@gmail.com>
Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
Signed-off-by: Diego Biurrun <diego@biurrun.de>
(cherry picked from commit 9d599e3f6e61438772d8cddd6c9b7c495251f51e)
Signed-off-by: Reinhard Tartler <siretart@tauware.de>
5 years agoUpdate Changelog
John Stebbins [Mon, 3 Mar 2014 20:20:14 +0000 (20:20 +0000)]
Update Changelog

5 years agoarm: hpeldsp: fix put_pixels8_y2_{,no_rnd_}armv6
Janne Grunau [Sat, 8 Mar 2014 10:52:14 +0000 (11:52 +0100)]
arm: hpeldsp: fix put_pixels8_y2_{,no_rnd_}armv6

The overread avoidance fix in cbddee1cca0ebd01e8c5aa694d31228eb4de4b41
broke the computation for the last row since it prevented the safe
reading from the height+1-th row.

CC: libav-stable@libav.org
(cherry picked from commit 61985ad72c47bbb668f2d3923bf5c9df83e79323)

5 years agoarm: hpeldsp: prevent overreads in armv6 asm
Janne Grunau [Wed, 5 Mar 2014 11:44:57 +0000 (12:44 +0100)]
arm: hpeldsp: prevent overreads in armv6 asm

Based on a patch by Russel King <rmk+libav@arm.linux.org.uk>

Bug-Id: 646
CC: libav-stable@libav.org
(cherry picked from commit cbddee1cca0ebd01e8c5aa694d31228eb4de4b41)

5 years agoavfilter: Add missing emms_c when needed
Luca Barbato [Wed, 5 Mar 2014 09:41:33 +0000 (10:41 +0100)]
avfilter: Add missing emms_c when needed

Arch specific calls should have an emms_c following to keep the cpu
state consistent.

Reported-By: wm4
CC: libav-stable@libav.org
(cherry picked from commit e995cf1bccc6e91bbaa6a8771e23fb3ab259c110)

5 years agoUpdate Changelog for v10.1
Reinhard Tartler [Sat, 10 May 2014 14:05:03 +0000 (10:05 -0400)]
Update Changelog for v10.1

5 years agoAdd missing changelog entries for v10
Reinhard Tartler [Sat, 10 May 2014 14:01:31 +0000 (10:01 -0400)]
Add missing changelog entries for v10

5 years agortmpproto: Check the buffer sizes when copying app/playpath strings
Martin Storsjö [Thu, 8 May 2014 12:12:23 +0000 (15:12 +0300)]
rtmpproto: Check the buffer sizes when copying app/playpath strings

As pointed out by Reimar Döffinger.

CC: libav-stable@libav.org
Signed-off-by: Martin Storsjö <martin@martin.st>
(cherry picked from commit 0bacfa8d37710b904897e7cbeb8d6f96fbf75e2e)

Conflicts:
libavformat/rtmpproto.c

5 years agoswscale: Fix an undefined behaviour
Luca Barbato [Thu, 1 May 2014 22:21:23 +0000 (00:21 +0200)]
swscale: Fix an undefined behaviour

Prevent a division by zero down the codepath.

Sample-Id: 00001721-google
Reported-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
CC: libav-stable@libav.org
(cherry picked from commit 3a177a9cca924e097265b32f9282814f6b653e08)

5 years agovp9: Read the frame size as unsigned
Luca Barbato [Thu, 1 May 2014 22:18:04 +0000 (00:18 +0200)]
vp9: Read the frame size as unsigned

Sample-Id: 00001723-google
Reported-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
CC: libav-stable@libav.org
(cherry picked from commit 925c37874b617816b6f460c6f229c18b46548b46)

5 years agodcadec: Use correct channel count in stereo downmix check
Tim Walker [Sat, 12 Apr 2014 20:11:53 +0000 (22:11 +0200)]
dcadec: Use correct channel count in stereo downmix check

s->prim_channels is greater than num_core_channels
when an XCh extension is present in the bitstream.

Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
(cherry picked from commit 801c39e1e3058fc4ba822bfb5d8612d777111e32)

5 years agodcadec: Do not decode the XCh extension when downmixing to stereo
Tim Walker [Sat, 12 Apr 2014 20:11:52 +0000 (22:11 +0200)]
dcadec: Do not decode the XCh extension when downmixing to stereo

This is neither necessary nor currently supported.

Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
(cherry picked from commit c8cf461c19e8e35df4b7364d9b90aa42f1ab4560)

5 years agoUpdate for 2.2.2 n2.2.2
Michael Niedermayer [Sun, 4 May 2014 22:41:34 +0000 (00:41 +0200)]
Update for 2.2.2

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agolavd/opengl_enc: fix pixel data alignment
Lukasz Marek [Wed, 30 Apr 2014 18:49:52 +0000 (20:49 +0200)]
lavd/opengl_enc: fix pixel data alignment

Signed-off-by: Lukasz Marek <lukasz.m.luki2@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
(cherry picked from commit 8ff72924cfeb3c8fa8fc57cfea3f78ca0caaec0f)

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoffmpeg: print an error at the end if conversion failed
Michael Niedermayer [Mon, 31 Mar 2014 02:31:28 +0000 (04:31 +0200)]
ffmpeg: print an error at the end if conversion failed

Fixes Ticket3477

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

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoavfilter/graphdump: Fix pointer to local outside scope
Michael Niedermayer [Mon, 28 Apr 2014 02:01:50 +0000 (04:01 +0200)]
avfilter/graphdump: Fix pointer to local outside scope

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

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoffmpeg_filter: fix pointer to local outside scope
Michael Niedermayer [Sun, 27 Apr 2014 01:45:12 +0000 (03:45 +0200)]
ffmpeg_filter: fix pointer to local outside scope

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

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoavcodec/mjpegdec: Fix undefined shift
Michael Niedermayer [Sun, 27 Apr 2014 03:32:56 +0000 (05:32 +0200)]
avcodec/mjpegdec: Fix undefined shift

Fixes CID1194388

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

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoavformat/h263dec: Fix h263 probe
Michael Niedermayer [Wed, 23 Apr 2014 19:47:48 +0000 (21:47 +0200)]
avformat/h263dec: Fix h263 probe

The code was missing 1 bit in the src format

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

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoavfilter/filtfmts: Support dynamically allocated in/outputs
Michael Niedermayer [Mon, 21 Apr 2014 09:33:17 +0000 (11:33 +0200)]
avfilter/filtfmts: Support dynamically allocated in/outputs

Fixes crash
Fixes Ticket3468

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

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoiavcodec/vc1dec: Fix missing {}
Michael Niedermayer [Wed, 16 Apr 2014 00:06:37 +0000 (02:06 +0200)]
iavcodec/vc1dec: Fix missing {}

Fixes part of Ticket3466
Found-by: Andrey_Karpov / PVS-Studio
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
(cherry picked from commit cb53beb81a5b9192c79de401f1e1e13fadddc429)

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoavfilter/vf_deshake: fix loss of precission with odd resolutions
Michael Niedermayer [Wed, 16 Apr 2014 00:06:37 +0000 (02:06 +0200)]
avfilter/vf_deshake: fix loss of precission with odd resolutions

Fixes part of Ticket3466
Found-by: Andrey_Karpov / PVS-Studio
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
(cherry picked from commit 73734282e0e4df92269984ee1671424e39249481)

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoavfilter/f_select: fix loss of precission in SAD calculation
Michael Niedermayer [Wed, 16 Apr 2014 00:06:37 +0000 (02:06 +0200)]
avfilter/f_select: fix loss of precission in SAD calculation

Fixes part of Ticket3466
Found-by: Andrey_Karpov / PVS-Studio
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
(cherry picked from commit 5a8ef3c66b762f265b05aa096105555f1d26879c)

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoavcodec/g723_1: add assert to help static code analyzers
Michael Niedermayer [Wed, 16 Apr 2014 00:55:13 +0000 (02:55 +0200)]
avcodec/g723_1: add assert to help static code analyzers

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

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoavcodec/diracdec: fix undefined behavior with shifts
Michael Niedermayer [Wed, 16 Apr 2014 00:06:37 +0000 (02:06 +0200)]
avcodec/diracdec: fix undefined behavior with shifts

Fixes part of Ticket3466
Found-by: Andrey_Karpov / PVS-Studio
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
(cherry picked from commit b8598f6ce61ccda3f2ff0c730b009fb650e42986)

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoavformat/mpegts: Remove redundant check
Michael Niedermayer [Wed, 16 Apr 2014 00:06:37 +0000 (02:06 +0200)]
avformat/mpegts: Remove redundant check

Fixes part of Ticket3466
Found-by: Andrey_Karpov / PVS-Studio
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
(cherry picked from commit ff6fa0b4b980fc5b9f7653d7b159ae02c3d95210)

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoavcodec/fic: Fix return value check
Michael Niedermayer [Wed, 16 Apr 2014 00:06:37 +0000 (02:06 +0200)]
avcodec/fic: Fix return value check

Fixes part of Ticket3466
Found-by: Andrey_Karpov / PVS-Studio
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
(cherry picked from commit 230db1426d127a25c03b457fec25900653de2721)

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoavcodec/dcadec: fix error message suppression code
Michael Niedermayer [Wed, 16 Apr 2014 00:06:37 +0000 (02:06 +0200)]
avcodec/dcadec: fix error message suppression code

Fixes part of Ticket3466
Found-by: Andrey_Karpov / PVS-Studio
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
(cherry picked from commit f202af29c93f3e9b4103c3c254a8974d7c662315)

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoavcodec/mjpegen: Fix declared argument size
Michael Niedermayer [Wed, 16 Apr 2014 00:06:37 +0000 (02:06 +0200)]
avcodec/mjpegen: Fix declared argument size

Fixes part of Ticket3466
Found-by: Andrey_Karpov / PVS-Studio
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
(cherry picked from commit 256f530603ef3838a712a4fcd737b46b7bce455e)

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoswscale/swscale: fix srcStride/srcSlice typo
Michael Niedermayer [Tue, 15 Apr 2014 23:55:08 +0000 (01:55 +0200)]
swscale/swscale: fix srcStride/srcSlice typo

Fixes part of Ticket3466
Found by: Andrey_Karpov / PVS-Studio
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
(cherry picked from commit 14fa7fc6a81d5e59e05243cdc92108eab1b138ac)

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoavcodec/x86/idct_sse2_xvid: fix non C99 inline function
Michael Niedermayer [Mon, 14 Apr 2014 15:29:27 +0000 (17:29 +0200)]
avcodec/x86/idct_sse2_xvid: fix non C99 inline function

Found-by: Matt Oliver <protogonoi@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
(cherry picked from commit 46d5625f44185271862337d61cd246fd569c42a4)

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoavformat/rtmpproto: Added handling of an initial RTMP chunk size packet.
Stephan Soller [Sat, 12 Apr 2014 23:06:22 +0000 (01:06 +0200)]
avformat/rtmpproto: Added handling of an initial RTMP chunk size packet.

Fixes ticket #2911.

Reviewed-by: Nicolas George <george@nsup.org>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
(cherry picked from commit 36b9c27dae452e10b4fff3d10f836160a5b8fbbd)

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoMerge commit '79041d92ee7421853ee8c57fc13891cb0c272e0e' into release/2.2
Michael Niedermayer [Sun, 4 May 2014 19:25:27 +0000 (21:25 +0200)]
Merge commit '79041d92ee7421853ee8c57fc13891cb0c272e0e' into release/2.2

* commit '79041d92ee7421853ee8c57fc13891cb0c272e0e':
  matroska: add the Opus mapping

Conflicts:
libavformat/matroska.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoMerge commit '82cebc0e0544dce507749dd9b1c2983f083de836' into release/2.2
Michael Niedermayer [Sun, 4 May 2014 19:01:38 +0000 (21:01 +0200)]
Merge commit '82cebc0e0544dce507749dd9b1c2983f083de836' into release/2.2

* commit '82cebc0e0544dce507749dd9b1c2983f083de836':
  matroskadec: read the CodecDelay element

Conflicts:
libavformat/matroska.h

Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoMerge commit 'c4e764aa6980dd9dc7c423921b415ff7261c944a' into release/2.2
Michael Niedermayer [Sun, 4 May 2014 18:54:43 +0000 (20:54 +0200)]
Merge commit 'c4e764aa6980dd9dc7c423921b415ff7261c944a' into release/2.2

* commit 'c4e764aa6980dd9dc7c423921b415ff7261c944a':
  rtmpproto: Make sure to pass on the error code if read_connect failed

Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoMerge commit '9d02e38d3f03100784348ff75fd181d2aaad7e43' into release/2.2
Michael Niedermayer [Sun, 4 May 2014 18:14:18 +0000 (20:14 +0200)]
Merge commit '9d02e38d3f03100784348ff75fd181d2aaad7e43' into release/2.2

* commit '9d02e38d3f03100784348ff75fd181d2aaad7e43':
  lavr: allocate the resampling buffer with a positive size

Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoMerge commit '0f6e309b97e3da83a0fa75fbf1c4b50cd72047eb' into release/2.2
Michael Niedermayer [Sun, 4 May 2014 18:13:41 +0000 (20:13 +0200)]
Merge commit '0f6e309b97e3da83a0fa75fbf1c4b50cd72047eb' into release/2.2

* commit '0f6e309b97e3da83a0fa75fbf1c4b50cd72047eb':
  mp3enc: Properly write bitrate value in XING header

Conflicts:
libavformat/mp3enc.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agomatroska: add the Opus mapping
Anton Khirnov [Sun, 27 Apr 2014 11:40:11 +0000 (13:40 +0200)]
matroska: add the Opus mapping

(cherry picked from commit 141fdc763c2841b572d29a2ad78513e8d5325870)
Signed-off-by: Reinhard Tartler <siretart@tauware.de>
5 years agomatroskadec: read the CodecDelay element
Anton Khirnov [Tue, 29 Apr 2014 10:03:13 +0000 (12:03 +0200)]
matroskadec: read the CodecDelay element

(cherry picked from commit eb3b5501e8b85bfea09d533314cb6920efc42639)
Signed-off-by: Reinhard Tartler <siretart@tauware.de>
Conflicts:
libavformat/matroskadec.c

5 years agosws: dont use the optimized 410->420 unscaled conversion when height%4
Michael Niedermayer [Wed, 30 Apr 2014 04:21:58 +0000 (06:21 +0200)]
sws: dont use the optimized 410->420 unscaled conversion when height%4

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

5 years agoavcodec/vorbisdec: try to workaround libvorbisenc bug
Michael Niedermayer [Wed, 30 Apr 2014 02:12:29 +0000 (04:12 +0200)]
avcodec/vorbisdec: try to workaround libvorbisenc bug

Fixes Ticket3590

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

5 years agoswresample: fix AV_CH_LAYOUT_STEREO_DOWNMIX input
Michael Niedermayer [Wed, 23 Apr 2014 23:25:46 +0000 (01:25 +0200)]
swresample: fix AV_CH_LAYOUT_STEREO_DOWNMIX input

Fixes Ticket 3542

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

5 years agoavformat/mux: Check for and remove invalid packet durations
Michael Niedermayer [Wed, 23 Apr 2014 04:04:50 +0000 (06:04 +0200)]
avformat/mux: Check for and remove invalid packet durations

Fixes assertion failure
Fixes Ticket3575

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

5 years agoavformat/avidec: Speed up keyframe detection code
Michael Niedermayer [Tue, 22 Apr 2014 02:00:32 +0000 (04:00 +0200)]
avformat/avidec: Speed up keyframe detection code

Fixes Ticket3531

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

5 years agoffprobe: fix scaling of vali in value_string() in case -prefix is selected
Stefano Sabatini [Tue, 22 Apr 2014 11:01:14 +0000 (13:01 +0200)]
ffprobe: fix scaling of vali in value_string() in case -prefix is selected

Fix trac ticket #3523.
(cherry picked from commit 1ba59b1cbeafe7cd28db04f772abd89eb7e4ce1e)

5 years agoavformat/asfenc: dont allow non interleaved packets
Michael Niedermayer [Mon, 21 Apr 2014 00:39:00 +0000 (02:39 +0200)]
avformat/asfenc: dont allow non interleaved packets

The muxer does not support this currently

Fixes ticket #3547.
Fixes ticket #3555.

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

5 years agoavformat/pmpdec: remove cur_dts timestamp hack
Michael Niedermayer [Sun, 20 Apr 2014 22:58:24 +0000 (00:58 +0200)]
avformat/pmpdec: remove cur_dts timestamp hack

It appears the demuxer works fine without it

Fixes Ticket3534

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

5 years agoavformat: Fix decoder search in find stream info
Michael Niedermayer [Mon, 21 Apr 2014 01:38:07 +0000 (03:38 +0200)]
avformat: Fix decoder search in find stream info

Fixes Ticket3548

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

5 years agortmpproto: Make sure to pass on the error code if read_connect failed
Martin Storsjö [Sun, 13 Apr 2014 10:44:03 +0000 (13:44 +0300)]
rtmpproto: Make sure to pass on the error code if read_connect failed

Previously, if read_connect failed, the ret variable was unmodified
and had the value 0, indicating success, which then was returned from
the rtmp_open function, even though it actually failed.

CC: libav-stable@libav.org
Signed-off-by: Martin Storsjö <martin@martin.st>
(cherry picked from commit 6477139721f559b26eafd415e23e13ea2b0c27e1)
Signed-off-by: Reinhard Tartler <siretart@tauware.de>
5 years agolavr: allocate the resampling buffer with a positive size
Anton Khirnov [Thu, 20 Mar 2014 19:40:24 +0000 (20:40 +0100)]
lavr: allocate the resampling buffer with a positive size

This fixes cases where very few input samples (fewer than needed for one
output sample) are passed to lavr at the beginning.
CC:libav-stable@libav.org

(cherry picked from commit ac976ed91e323754e9a84509873ebdb437372797)
Signed-off-by: Reinhard Tartler <siretart@tauware.de>
5 years agoff_id3v2_read: add option to limit ID3 magic number search
Peter Ross [Fri, 18 Apr 2014 04:49:40 +0000 (14:49 +1000)]
ff_id3v2_read: add option to limit ID3 magic number search

Several chunked formats (AIFF, IFF,DSF) store ID3 metadata within an 'ID3 '
chunk tag. If such chunks are stored sequentially, it is possible for the
ID3v2 parser to confuse the chunk tag for the ID3 magic number. e.g.

[1st chunk tag ('ID3 ') | chunk size] [ID3 magic number | metadata ...]
[2nd chunk tag ('ID3 ') | chunk size] [ID3 magic number | metadata ...]

Fixes ticket #3530.

Signed-off-by: Peter Ross <pross@xvid.org>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
(cherry picked from commit 5331773cc33ba26b9e26ace643d926219e46a17b)

Conflicts:
libavformat/dsfdec.c

5 years agoff_id3v2_free_extra_meta: set the pointer pointing to extra_meta to NULL
Peter Ross [Sat, 19 Apr 2014 02:12:00 +0000 (12:12 +1000)]
ff_id3v2_free_extra_meta: set the pointer pointing to extra_meta to NULL

Fixes ticket #3530.

Signed-off-by: Peter Ross <pross@xvid.org>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
(cherry picked from commit c94305ae23318c8956a30485cd5642829f4f16a9)

5 years agoDo not overwrite VDPAU structures in ff_MPV_frame_start().
Carl Eugen Hoyos [Fri, 18 Apr 2014 02:56:34 +0000 (04:56 +0200)]
Do not overwrite VDPAU structures in ff_MPV_frame_start().

Fixes crashes with VDR and MPlayer as reported by irc user crow.
(cherry picked from commit 941b2240f2ce59c41f4a9ffec88c512f64c75613)

5 years agoFix compilation with --disable-everything --enable-muxer=avi --disable-network.
Anh [Wed, 16 Apr 2014 18:00:17 +0000 (20:00 +0200)]
Fix compilation with --disable-everything --enable-muxer=avi --disable-network.

Fixes ticket #3568.
(cherry picked from commit c150e2cf324ce0572bb8b9b3501c45465cfbf360)

5 years agoavutil/avstring: do not lose ascii characters when decoding non utf-8 with av_utf8_de...
Michael Niedermayer [Sat, 12 Apr 2014 18:01:33 +0000 (20:01 +0200)]
avutil/avstring: do not lose ascii characters when decoding non utf-8 with av_utf8_decode()

Fixes Ticket3363

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

5 years agoffprobe: do not lose non ascii characters in non utf8 strings
Michael Niedermayer [Sat, 12 Apr 2014 18:13:13 +0000 (20:13 +0200)]
ffprobe: do not lose non ascii characters in non utf8 strings

Fixes Ticket3363

Using U+FFFD REPLACEMENT CHARACTER as suggested by nicolas

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