ffmpeg.git
5 years agolibvpxenc: update cpu-used default
James Zern [Sat, 23 Nov 2013 04:26:46 +0000 (20:26 -0800)]
libvpxenc: update cpu-used default

3 -> 1. vp8 encoding speed has improved since the initial release and 1
is a reasonable default for vp9 as well.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agolibvpxdec: set CODEC_CAP_DR1 for vp9
James Zern [Sat, 23 Nov 2013 04:26:22 +0000 (20:26 -0800)]
libvpxdec: set CODEC_CAP_DR1 for vp9

it shares vp8_decode() with vp8 which already has the flag set

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoMerge remote-tracking branch 'qatar/master'
Michael Niedermayer [Sat, 23 Nov 2013 13:53:39 +0000 (14:53 +0100)]
Merge remote-tracking branch 'qatar/master'

* qatar/master:
  libschroedingerenc: do not assert on values from external libraries

Conflicts:
libavcodec/libschroedingerenc.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoMerge commit '7671dd7cd7d51bbd637cc46d8f104a141bc355ea'
Michael Niedermayer [Sat, 23 Nov 2013 13:43:08 +0000 (14:43 +0100)]
Merge commit '7671dd7cd7d51bbd637cc46d8f104a141bc355ea'

* commit '7671dd7cd7d51bbd637cc46d8f104a141bc355ea':
  avconv: add support for VDPAU decoding

Conflicts:
Changelog
Makefile
configure
ffmpeg.h

Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoMerge commit '07fd0a22192805d56c635eb294dc26b0a54ae325'
Michael Niedermayer [Sat, 23 Nov 2013 13:26:27 +0000 (14:26 +0100)]
Merge commit '07fd0a22192805d56c635eb294dc26b0a54ae325'

* commit '07fd0a22192805d56c635eb294dc26b0a54ae325':
  avconv: add infrastructure for using hwaccels

Conflicts:
ffmpeg.c
ffmpeg.h
ffmpeg_filter.c
ffmpeg_opt.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoMerge commit 'd4df02131b5522a99a4e6035368484e809706ed5'
Michael Niedermayer [Sat, 23 Nov 2013 12:45:04 +0000 (13:45 +0100)]
Merge commit 'd4df02131b5522a99a4e6035368484e809706ed5'

* commit 'd4df02131b5522a99a4e6035368484e809706ed5':
  ac3dec: Remove write-only channel_layout field from AC3DecodeContext

Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agolibavcodec/ac3dec: fix channel_layout
Michael Niedermayer [Sat, 23 Nov 2013 12:32:18 +0000 (13:32 +0100)]
libavcodec/ac3dec: fix channel_layout

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoMerge commit 'b53285462263ef8a795f0e289abd5799b4c57652'
Michael Niedermayer [Sat, 23 Nov 2013 11:18:07 +0000 (12:18 +0100)]
Merge commit 'b53285462263ef8a795f0e289abd5799b4c57652'

* commit 'b53285462263ef8a795f0e289abd5799b4c57652':
  ac3: implement request_channel_layout.

Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoMerge commit 'c16bfb147df8a9d350e8a0dbc01937b78faf5949'
Michael Niedermayer [Sat, 23 Nov 2013 11:01:42 +0000 (12:01 +0100)]
Merge commit 'c16bfb147df8a9d350e8a0dbc01937b78faf5949'

* commit 'c16bfb147df8a9d350e8a0dbc01937b78faf5949':
  swscale: x86: Consistently use lowercase function name suffixes

Conflicts:
libswscale/x86/rgb2rgb.c
libswscale/x86/swscale.c

See: 1de064e21e7f1bbdd2347ba8967089a18669fcf8
Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agolibschroedingerenc: do not assert on values from external libraries
Alexandra Khirnova [Thu, 21 Nov 2013 21:06:31 +0000 (22:06 +0100)]
libschroedingerenc: do not assert on values from external libraries

Signed-off-by: Anton Khirnov <anton@khirnov.net>
5 years agoavconv: add support for VDPAU decoding
Anton Khirnov [Sun, 3 Nov 2013 18:21:00 +0000 (19:21 +0100)]
avconv: add support for VDPAU decoding

5 years agoavconv: add infrastructure for using hwaccels
Anton Khirnov [Sat, 2 Nov 2013 21:06:36 +0000 (22:06 +0100)]
avconv: add infrastructure for using hwaccels

5 years agoAdd --enable-rpath option to add -Wl,-rpath to pkg-config files.
Reimar Döffinger [Sun, 10 Nov 2013 08:02:51 +0000 (09:02 +0100)]
Add --enable-rpath option to add -Wl,-rpath to pkg-config files.

This allows installing into e.g. /usr/lib/ffmpeg and binaries linked
against ffmpeg will pick these .so file while binaries linked against
some fork or different version will pick the libraries in /usr/lib.
There will be still some issues for binaries that (indirectly) end up
depending on multiple variants, but for the simpler cases it should allow
different applications to use different (compatible) variants that
are installed at the same time.

Signed-off-by: Reimar Döffinger <Reimar.Doeffinger@gmx.de>
5 years agoavcodec/hnm4video: check writeoffset in decode_interframe_v4a()
Michael Niedermayer [Fri, 22 Nov 2013 22:48:58 +0000 (23:48 +0100)]
avcodec/hnm4video: check writeoffset in decode_interframe_v4a()

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoavformat/hnm: check chunk_size == 0
Michael Niedermayer [Fri, 22 Nov 2013 22:44:57 +0000 (23:44 +0100)]
avformat/hnm: check chunk_size == 0

Fixes potential infinite loop

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoavcodec/hnm4video: check dimensions for validity
Michael Niedermayer [Fri, 22 Nov 2013 22:11:20 +0000 (23:11 +0100)]
avcodec/hnm4video: check dimensions for validity

Fixes out of array read
Fixes: asan_heap-oob_e76e18_1244_CASSE.HNM
Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoac3dec: Remove write-only channel_layout field from AC3DecodeContext
Tim Walker [Fri, 22 Nov 2013 16:25:49 +0000 (17:25 +0100)]
ac3dec: Remove write-only channel_layout field from AC3DecodeContext

Signed-off-by: Diego Biurrun <diego@biurrun.de>
5 years agoac3: implement request_channel_layout.
Tim Walker [Fri, 22 Nov 2013 16:25:48 +0000 (17:25 +0100)]
ac3: implement request_channel_layout.

Signed-off-by: Diego Biurrun <diego@biurrun.de>
5 years agoavcodec/vp9dsp: pass dconly bit as macro argument.
Clément Bœsch [Fri, 22 Nov 2013 22:26:28 +0000 (23:26 +0100)]
avcodec/vp9dsp: pass dconly bit as macro argument.

5 years agoswscale: x86: Consistently use lowercase function name suffixes
Diego Biurrun [Thu, 21 Nov 2013 15:30:00 +0000 (16:30 +0100)]
swscale: x86: Consistently use lowercase function name suffixes

5 years agoavcodec/hnm4video: fix missing newlines in error messages
Michael Niedermayer [Fri, 22 Nov 2013 21:15:35 +0000 (22:15 +0100)]
avcodec/hnm4video: fix missing newlines in error messages

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoavcodec/hnm4video: fix write offset checks in decode_interframe_v4()
Michael Niedermayer [Fri, 22 Nov 2013 20:55:13 +0000 (21:55 +0100)]
avcodec/hnm4video: fix write offset checks in decode_interframe_v4()

Fixes: asan_heap-oob_e76a51_1244_CASSE.HNM

Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoavcodec/hnm4video: check offset in decode_interframe_v4() more completely
Michael Niedermayer [Fri, 22 Nov 2013 20:00:11 +0000 (21:00 +0100)]
avcodec/hnm4video: check offset in decode_interframe_v4() more completely

Fixes out of array reads
Fixes: signal_sigsegv_e74c1e_1092_BROCIME.HNM
Fixes: signal_sigsegv_e74e85_2620_PLAQUE0.HNM

Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoavformat/mov: Check that we have a stream before accessing it in mov_read_ares()
Michael Niedermayer [Fri, 22 Nov 2013 19:09:03 +0000 (20:09 +0100)]
avformat/mov: Check that we have a stream before accessing it in mov_read_ares()

Fixes out of array read
Fixes: signal_sigsegv_6f1855_3910_avid_test_alpha.mov

Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoavcodec/vp9dsp: add DC only versions for idct/idct.
Clément Bœsch [Fri, 22 Nov 2013 19:16:09 +0000 (20:16 +0100)]
avcodec/vp9dsp: add DC only versions for idct/idct.

before:
  ./ffmpeg -v 0 -nostats -i ~/samples/vp9/etv.webm -f null -  16.29s user 0.02s system 99% cpu 16.323 total
  ./ffmpeg -v 0 -nostats -i ~/samples/vp9/etv.webm -f null -  16.32s user 0.01s system 99% cpu 16.351 total
  ./ffmpeg -v 0 -nostats -i ~/samples/vp9/etv.webm -f null -  16.27s user 0.05s system 99% cpu 16.335 total

after:
  ./ffmpeg -v 0 -nostats -i ~/samples/vp9/etv.webm -f null -  15.22s user 0.03s system 99% cpu 15.257 total
  ./ffmpeg -v 0 -nostats -i ~/samples/vp9/etv.webm -f null -  15.20s user 0.02s system 99% cpu 15.237 total
  ./ffmpeg -v 0 -nostats -i ~/samples/vp9/etv.webm -f null -  15.19s user 0.02s system 99% cpu 15.227 total

5 years agoavformat/ipmovie: check OPCODE_INIT_VIDEO_BUFFERS size more completely
Michael Niedermayer [Fri, 22 Nov 2013 18:47:34 +0000 (19:47 +0100)]
avformat/ipmovie: check OPCODE_INIT_VIDEO_BUFFERS size more completely

Fixes use of uninitialized data

Fixes: signal_sigsegv_1571228_5930_ipmovie_interplayvideo_interplay_dpcm__bislogo.mve

Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoavcodec/rv10: revert hunk from ce9f5b13ed1eb1882479574c12af24cf0e2b8aaf
Michael Niedermayer [Fri, 22 Nov 2013 18:30:33 +0000 (19:30 +0100)]
avcodec/rv10: revert hunk from ce9f5b13ed1eb1882479574c12af24cf0e2b8aaf

Fixes segfault
Fixes: signal_sigsegv_103f872_2759_RVTR_behere_ivideo_motor_cross_interview_final_56kbps.rm

Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoMerge remote-tracking branch 'qatar/master'
Michael Niedermayer [Fri, 22 Nov 2013 17:15:09 +0000 (18:15 +0100)]
Merge remote-tracking branch 'qatar/master'

* qatar/master:
  hls: Avoid reading outside of the allocated array

Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoMerge commit '8c929098141ebc94ad3f303521c520bb3dc6d8f6'
Michael Niedermayer [Fri, 22 Nov 2013 17:07:23 +0000 (18:07 +0100)]
Merge commit '8c929098141ebc94ad3f303521c520bb3dc6d8f6'

* commit '8c929098141ebc94ad3f303521c520bb3dc6d8f6':
  hls: Check whether the AVIOContext contains a new redirected URL

Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoMerge commit 'be4edda6731a341d3fdeaa0e57753dc396790362'
Michael Niedermayer [Fri, 22 Nov 2013 16:48:45 +0000 (17:48 +0100)]
Merge commit 'be4edda6731a341d3fdeaa0e57753dc396790362'

* commit 'be4edda6731a341d3fdeaa0e57753dc396790362':
  http: Expose the content location via an AVOption

Conflicts:
libavformat/http.c
libavformat/version.h

Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoMerge commit '393d80cc278e2b2f5c9e7805db176e6f28335a33'
Michael Niedermayer [Fri, 22 Nov 2013 16:26:03 +0000 (17:26 +0100)]
Merge commit '393d80cc278e2b2f5c9e7805db176e6f28335a33'

* commit '393d80cc278e2b2f5c9e7805db176e6f28335a33':
  http: Support relative URL redirection

Conflicts:
libavformat/http.c

See: 4a4c93cb3f2f564263f4b20446a7d500772e0d40
Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agodoc: delete git-howto.txt
Timothy Gu [Sat, 9 Nov 2013 23:36:39 +0000 (15:36 -0800)]
doc: delete git-howto.txt

This is already available in Texinfo version.

Signed-off-by: Timothy Gu <timothygu99@gmail.com>
Signed-off-by: Stefano Sabatini <stefasab@gmail.com>
5 years agoMerge commit '76267ecc82e3018e1913a2483d5fc47d0949cbd8'
Michael Niedermayer [Fri, 22 Nov 2013 16:18:41 +0000 (17:18 +0100)]
Merge commit '76267ecc82e3018e1913a2483d5fc47d0949cbd8'

* commit '76267ecc82e3018e1913a2483d5fc47d0949cbd8':
  http: Remove an unrelated and mistakenly set AVOption unit name

Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoavutil/utf8: put under #ifdef TEST
Michael Niedermayer [Fri, 22 Nov 2013 16:09:31 +0000 (17:09 +0100)]
avutil/utf8: put under #ifdef TEST

All other test programs are under #ifdef TEST too
with the implementation and test code being generally in the same file

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoavcodec/hnm4video: check intraframe size
Michael Niedermayer [Fri, 22 Nov 2013 15:54:01 +0000 (16:54 +0100)]
avcodec/hnm4video: check intraframe size

Fixes hypothetical integer overflow with HNM4_CHUNK_ID_IZ

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoavcodec/mjpegdec: check len in mjpeg_decode_app() more completely
Michael Niedermayer [Fri, 22 Nov 2013 15:51:07 +0000 (16:51 +0100)]
avcodec/mjpegdec: check len in mjpeg_decode_app() more completely

Avoids len from becoming negative and causing assertion failure

Fixes: signal_sigabrt_7ffff7126425_5140_fd44dc63fa7bdd12ee34fc602231ef02.jpg

Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoavcodec/hnm4video: check that packetsize is at least 8
Michael Niedermayer [Fri, 22 Nov 2013 15:37:50 +0000 (16:37 +0100)]
avcodec/hnm4video: check that packetsize is at least 8

Fixes integer overflow and assertion failure
Fixes: signal_sigabrt_7ffff7126425_1243_CASSE.HNM

Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoavformat/avidec: Dont assert the existence of an index for video streams.
Michael Niedermayer [Fri, 22 Nov 2013 14:08:04 +0000 (15:08 +0100)]
avformat/avidec: Dont assert the existence of an index for video streams.

Its possible in various rare cases that an index cannot be created or allocated.
Fixes assertion failure
Fixes: signal_sigabrt_7ffff7126425_7712_pokem.avi

Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoffprobe: remove various useless ","
Stefano Sabatini [Fri, 22 Nov 2013 15:58:24 +0000 (16:58 +0100)]
ffprobe: remove various useless ","

Nitted-By: ubitux
5 years agoffprobe: implement string validation setting
Stefano Sabatini [Wed, 2 Oct 2013 14:22:17 +0000 (16:22 +0200)]
ffprobe: implement string validation setting

This should fix trac tickets #1163, #2502.

5 years agoffprobe: add support for nested options in writer contexts
Stefano Sabatini [Wed, 20 Nov 2013 14:30:47 +0000 (15:30 +0100)]
ffprobe: add support for nested options in writer contexts

5 years agoffprobe: check for errors, and abort immediately
Stefano Sabatini [Wed, 2 Oct 2013 14:55:15 +0000 (16:55 +0200)]
ffprobe: check for errors, and abort immediately

This allows to make use of validation features.

5 years agolavu/avstring: add av_utf8_decode() function
Stefano Sabatini [Wed, 2 Oct 2013 23:21:40 +0000 (01:21 +0200)]
lavu/avstring: add av_utf8_decode() function

5 years agolavu/dict.h: extend/clarify docs for av_dict_parse_string()
Stefano Sabatini [Wed, 20 Nov 2013 14:28:17 +0000 (15:28 +0100)]
lavu/dict.h: extend/clarify docs for av_dict_parse_string()

5 years agolavu/dict.h: apply various fixes/extensions to doxy
Stefano Sabatini [Wed, 20 Nov 2013 14:08:32 +0000 (15:08 +0100)]
lavu/dict.h: apply various fixes/extensions to doxy

In particular, document AV_DICT_MATCH_CASE, AV_DICT_IGNORE_SUFFIX, and
extend documentation for av_dict_get().

5 years agodoc/encoders/libfdk_aac: state that VBR support is experimental
Stefano Sabatini [Fri, 22 Nov 2013 13:42:31 +0000 (14:42 +0100)]
doc/encoders/libfdk_aac: state that VBR support is experimental

5 years agodoc/encoders/libfdk_aac: fix a few typos
Stefano Sabatini [Fri, 22 Nov 2013 13:54:40 +0000 (14:54 +0100)]
doc/encoders/libfdk_aac: fix a few typos

5 years agodoc/encoders/libfdk_aac: use @ref to reference libfaac
Stefano Sabatini [Fri, 22 Nov 2013 13:40:45 +0000 (14:40 +0100)]
doc/encoders/libfdk_aac: use @ref to reference libfaac

5 years agohls: Avoid reading outside of the allocated array
Martin Storsjö [Thu, 21 Nov 2013 09:53:58 +0000 (11:53 +0200)]
hls: Avoid reading outside of the allocated array

CC: libav-stable@libav.org
Signed-off-by: Martin Storsjö <martin@martin.st>
5 years agohls: Check whether the AVIOContext contains a new redirected URL
Martin Storsjö [Thu, 21 Nov 2013 09:31:53 +0000 (11:31 +0200)]
hls: Check whether the AVIOContext contains a new redirected URL

This allows both the main playlist itself as well as the variant
playlists to handle redirects combined with relative URLs.

Signed-off-by: Martin Storsjö <martin@martin.st>
5 years agohttp: Expose the content location via an AVOption
Martin Storsjö [Thu, 21 Nov 2013 09:25:16 +0000 (11:25 +0200)]
http: Expose the content location via an AVOption

Signed-off-by: Martin Storsjö <martin@martin.st>
5 years agohttp: Support relative URL redirection
Zhang Rui [Thu, 4 Jul 2013 09:18:52 +0000 (17:18 +0800)]
http: Support relative URL redirection

In RFC 2616, this was explicitly said to be an absolute URL,
while in an upcoming draft [1] it is allowed to be relative as well.

[1] http://tools.ietf.org/html/draft-ietf-httpbis-p2-semantics-25#section-7.1.2

Signed-off-by: Martin Storsjö <martin@martin.st>
5 years agohttp: Remove an unrelated and mistakenly set AVOption unit name
Martin Storsjö [Wed, 20 Nov 2013 12:53:56 +0000 (14:53 +0200)]
http: Remove an unrelated and mistakenly set AVOption unit name

This was due to a copypaste oversight.

Signed-off-by: Martin Storsjö <martin@martin.st>
5 years agoMerge remote-tracking branch 'qatar/master'
Michael Niedermayer [Fri, 22 Nov 2013 11:52:10 +0000 (12:52 +0100)]
Merge remote-tracking branch 'qatar/master'

* qatar/master:
  aacps: Adjust some const qualifiers to suppress warnings

Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoMerge commit '430d12196432ded13f011a3bf7690f03c9b2e5d6'
Michael Niedermayer [Fri, 22 Nov 2013 11:51:00 +0000 (12:51 +0100)]
Merge commit '430d12196432ded13f011a3bf7690f03c9b2e5d6'

* commit '430d12196432ded13f011a3bf7690f03c9b2e5d6':
  pcx: round up in bits->bytes conversion in a buffer size check

Conflicts:
libavcodec/pcx.c

See: 6462268e74fa2c935c2936904cc1da9f499c04f3
Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoMerge commit 'c918e08b9cc9ce8d06159c51da55ec5ab018039a'
Michael Niedermayer [Fri, 22 Nov 2013 11:39:48 +0000 (12:39 +0100)]
Merge commit 'c918e08b9cc9ce8d06159c51da55ec5ab018039a'

* commit 'c918e08b9cc9ce8d06159c51da55ec5ab018039a':
  truemotion1: make sure index does not go out of bounds

See: fd4c1c0b70b5a06dd572d7e27799a2f4c3d9b984
Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoMerge commit 'ce9bba5340a5fb6f38974a19af019dd6aa2da035'
Michael Niedermayer [Fri, 22 Nov 2013 11:35:55 +0000 (12:35 +0100)]
Merge commit 'ce9bba5340a5fb6f38974a19af019dd6aa2da035'

* commit 'ce9bba5340a5fb6f38974a19af019dd6aa2da035':
  avidec: fix a memleak in the dv init code.

Conflicts:
libavformat/avidec.c

See: 8993c256950067f29bc750140514ef6a1f5fd05d
Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoMerge commit 'de4ec972c06d9047bc1b73bb13f858a5d77d8df0'
Michael Niedermayer [Fri, 22 Nov 2013 11:28:49 +0000 (12:28 +0100)]
Merge commit 'de4ec972c06d9047bc1b73bb13f858a5d77d8df0'

* commit 'de4ec972c06d9047bc1b73bb13f858a5d77d8df0':
  vc1: fix a memleak.

Conflicts:
libavcodec/vc1dec.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoMerge commit 'ca41c72c6d9515d9045bd3b68104525dee81b8d0'
Michael Niedermayer [Fri, 22 Nov 2013 11:10:17 +0000 (12:10 +0100)]
Merge commit 'ca41c72c6d9515d9045bd3b68104525dee81b8d0'

* commit 'ca41c72c6d9515d9045bd3b68104525dee81b8d0':
  motionpixels: clip VLC codes.

Not merged, the change is wrong, the condition is not possible unless
there are serious bugs elsewhere. No such bugs should exist in ffmpeg.

Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoMerge commit '8b516f154a0a08655cec2d13d12aadc58cae0b1c'
Michael Niedermayer [Fri, 22 Nov 2013 11:08:40 +0000 (12:08 +0100)]
Merge commit '8b516f154a0a08655cec2d13d12aadc58cae0b1c'

* commit '8b516f154a0a08655cec2d13d12aadc58cae0b1c':
  matroskadec: use correct compression parameters for current track CodecPrivate

See: dc6c36ce46d4c4d7cb63503afc2ee44f00bf3725
Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoMerge commit '30be1ea33e5525266ad871bed60b1893a53caeaf'
Michael Niedermayer [Fri, 22 Nov 2013 11:02:50 +0000 (12:02 +0100)]
Merge commit '30be1ea33e5525266ad871bed60b1893a53caeaf'

* commit '30be1ea33e5525266ad871bed60b1893a53caeaf':
  matroskadec: pad EBML_BIN data.

Conflicts:
libavformat/matroskadec.c

See: c63e76ba3553d7635b92ac3801f3087e85a76bfb
Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoMerge commit 'f0259a587ee3419dd894873ea617b4c98eeaca1c'
Michael Niedermayer [Fri, 22 Nov 2013 10:55:56 +0000 (11:55 +0100)]
Merge commit 'f0259a587ee3419dd894873ea617b4c98eeaca1c'

* commit 'f0259a587ee3419dd894873ea617b4c98eeaca1c':
  h264: check buffer size before accessing it

Conflicts:
libavcodec/h264.c

See: ea0ac11e52b9cf5264f3d4eb7543e760c2a5fbb4
Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoMerge commit '1f3e56b6dcc163a705704e98569d4850a31d651c'
Michael Niedermayer [Fri, 22 Nov 2013 10:39:00 +0000 (11:39 +0100)]
Merge commit '1f3e56b6dcc163a705704e98569d4850a31d651c'

* commit '1f3e56b6dcc163a705704e98569d4850a31d651c':
  gifdec: convert to bytestream2

Conflicts:
libavcodec/gifdec.c
libavcodec/lzw.c
libavcodec/lzw.h

See: 3fd60d804996031ceaba9cad0b38652b92551eb0
Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoavcodec/gifdec: print error if image is not within dimensions
Michael Niedermayer [Fri, 22 Nov 2013 10:00:02 +0000 (11:00 +0100)]
avcodec/gifdec: print error if image is not within dimensions

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoMerge commit 'c453723ad7d14abc5e82677eebaa6025fa598f08'
Michael Niedermayer [Fri, 22 Nov 2013 09:56:42 +0000 (10:56 +0100)]
Merge commit 'c453723ad7d14abc5e82677eebaa6025fa598f08'

* commit 'c453723ad7d14abc5e82677eebaa6025fa598f08':
  gifdec: check that the image dimensions are non-zero

Conflicts:
libavcodec/gifdec.c

See: 286930d302fd34cfc2541bfdd760a8bbf9f2d2e5
Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoMerge commit '074c769de93bf12e9f44d77e58a8c7167f9dfb13'
Michael Niedermayer [Fri, 22 Nov 2013 09:42:05 +0000 (10:42 +0100)]
Merge commit '074c769de93bf12e9f44d77e58a8c7167f9dfb13'

* commit '074c769de93bf12e9f44d77e58a8c7167f9dfb13':
  h264_cavlc: check the size of the intra PCM data.

This check is redundant, but does no harm

Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoaacps: Adjust some const qualifiers to suppress warnings
Diego Biurrun [Mon, 4 Nov 2013 18:14:12 +0000 (19:14 +0100)]
aacps: Adjust some const qualifiers to suppress warnings

5 years agoavformat/avidec: Skip duplicate strf chunks
Michael Niedermayer [Fri, 22 Nov 2013 01:04:59 +0000 (02:04 +0100)]
avformat/avidec: Skip duplicate strf chunks

Fixes Ticket3119

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agohevc : add hevc profile
gcocherel [Thu, 21 Nov 2013 10:29:05 +0000 (11:29 +0100)]
hevc : add hevc profile

(cherry picked from commit 0c8dfd8ad6400b33da55a9f4d9aa8d3f5c9d209f)

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agohevc : update hevc_ps.c
gcocherel [Thu, 21 Nov 2013 10:25:32 +0000 (11:25 +0100)]
hevc : update hevc_ps.c

(cherry picked from commit 088f2eb1ae42bffc63c2cee4e7eba8f47056043b)

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoavformat/avidec: also print position in print_tag()
Michael Niedermayer [Thu, 21 Nov 2013 23:27:08 +0000 (00:27 +0100)]
avformat/avidec: also print position in print_tag()

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agodoc/examples: do not check NULL values for avcodec_close()
Stefano Sabatini [Thu, 21 Nov 2013 22:29:56 +0000 (23:29 +0100)]
doc/examples: do not check NULL values for avcodec_close()

avcodec_close() does nothing in case the argument is NULL. Simplify.

5 years agolavfi/aevalsrc: initialize pointer to expression to NULL
Stefano Sabatini [Thu, 21 Nov 2013 22:13:16 +0000 (23:13 +0100)]
lavfi/aevalsrc: initialize pointer to expression to NULL

Fix crash in case of expression parsing failure.

5 years agoavcodec/x86/vp9dsp: merge a few SWAP together.
Clément Bœsch [Thu, 21 Nov 2013 22:04:40 +0000 (23:04 +0100)]
avcodec/x86/vp9dsp: merge a few SWAP together.

5 years agohevc : update hls_decode_neighbour(cherry picked from commit 14341c6d9a6885657ba36580...
gcocherel [Thu, 21 Nov 2013 10:29:56 +0000 (11:29 +0100)]
hevc : update hls_decode_neighbour(cherry picked from commit 14341c6d9a6885657ba365807223e96a67d6c0ed)

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agohevc : fix pcm(cherry picked from commit 12bbfdba1899d11044d2bd8457159fc8b4b52a76)
gcocherel [Thu, 21 Nov 2013 10:16:53 +0000 (11:16 +0100)]
hevc : fix pcm(cherry picked from commit 12bbfdba1899d11044d2bd8457159fc8b4b52a76)

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agopcx: round up in bits->bytes conversion in a buffer size check
Anton Khirnov [Fri, 15 Nov 2013 18:06:23 +0000 (19:06 +0100)]
pcx: round up in bits->bytes conversion in a buffer size check

Fixes invalid reads.
Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
CC:libav-stable@libav.org

5 years agotruemotion1: make sure index does not go out of bounds
Anton Khirnov [Fri, 15 Nov 2013 18:06:23 +0000 (19:06 +0100)]
truemotion1: make sure index does not go out of bounds

Fixes invalid reads.
Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
CC:libav-stable@libav.org

5 years agoavidec: fix a memleak in the dv init code.
Anton Khirnov [Fri, 15 Nov 2013 18:06:23 +0000 (19:06 +0100)]
avidec: fix a memleak in the dv init code.

Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
CC:libav-stable@libav.org

5 years agovc1: fix a memleak.
Anton Khirnov [Fri, 15 Nov 2013 14:33:20 +0000 (15:33 +0100)]
vc1: fix a memleak.

Happens on a B-frame when neither low_delay nor last_picture_ptr is set
(probably corrupted streams only).

Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
5 years agomotionpixels: clip VLC codes.
Anton Khirnov [Fri, 15 Nov 2013 14:33:20 +0000 (15:33 +0100)]
motionpixels: clip VLC codes.

Fixes invalid reads.
Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
CC:libav-stable@libav.org

5 years agomatroskadec: use correct compression parameters for current track CodecPrivate
Aurelien Jacobs [Sun, 21 Aug 2011 14:03:13 +0000 (16:03 +0200)]
matroskadec: use correct compression parameters for current track CodecPrivate

Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
CC:libav-stable@libav.org
Signed-off-by: Anton Khirnov <anton@khirnov.net>
5 years agomatroskadec: pad EBML_BIN data.
Anton Khirnov [Fri, 15 Nov 2013 09:15:24 +0000 (10:15 +0100)]
matroskadec: pad EBML_BIN data.

It might be passed to code requiring padding, such as lzo decompression.

Fixes invalid reads.
Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
CC:libav-stable@libav.org

5 years agoh264: check buffer size before accessing it
Anton Khirnov [Fri, 15 Nov 2013 09:15:24 +0000 (10:15 +0100)]
h264: check buffer size before accessing it

Fixes invalid reads.
Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
CC:libav-stable@libav.org

5 years agogifdec: convert to bytestream2
Anton Khirnov [Fri, 15 Nov 2013 09:23:04 +0000 (10:23 +0100)]
gifdec: convert to bytestream2

5 years agogifdec: check that the image dimensions are non-zero
Anton Khirnov [Fri, 15 Nov 2013 09:15:24 +0000 (10:15 +0100)]
gifdec: check that the image dimensions are non-zero

Also add an error message an return a more suitable error code
(INVALIDDATA, not EINVAL);
Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
CC:libav-stable@libav.org

5 years agoh264_cavlc: check the size of the intra PCM data.
Anton Khirnov [Fri, 15 Nov 2013 08:42:26 +0000 (09:42 +0100)]
h264_cavlc: check the size of the intra PCM data.

Fixes invalid reads.
Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
CC:libav-stable@libav.org

5 years agoMerge remote-tracking branch 'qatar/master'
Michael Niedermayer [Thu, 21 Nov 2013 18:15:28 +0000 (19:15 +0100)]
Merge remote-tracking branch 'qatar/master'

* qatar/master:
  dct/fft: Give consistent names to fixed/float template files

Conflicts:
libavcodec/fft_fixed.c
libavcodec/fft_float.c
libavcodec/mdct_fixed.c
libavcodec/mdct_float.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoMerge commit 'dd249245d012c1eceb57c166e256fc95e74f4bb1'
Michael Niedermayer [Thu, 21 Nov 2013 18:09:12 +0000 (19:09 +0100)]
Merge commit 'dd249245d012c1eceb57c166e256fc95e74f4bb1'

* commit 'dd249245d012c1eceb57c166e256fc95e74f4bb1':
  filter docs: reference scale and fps filters

Conflicts:
doc/filters.texi

Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoMerge commit 'd28fc7b29a728bd2f88c10121abbd0442c341746'
Michael Niedermayer [Thu, 21 Nov 2013 18:03:59 +0000 (19:03 +0100)]
Merge commit 'd28fc7b29a728bd2f88c10121abbd0442c341746'

* commit 'd28fc7b29a728bd2f88c10121abbd0442c341746':
  avconv_filter: add new line after error message

See: c790ae02654422f3fd8742c147f988e444ee3dd3
Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoMerge commit '874838dc6589d978611c89a40694a5074f892a76'
Michael Niedermayer [Thu, 21 Nov 2013 17:48:48 +0000 (18:48 +0100)]
Merge commit '874838dc6589d978611c89a40694a5074f892a76'

* commit '874838dc6589d978611c89a40694a5074f892a76':
  fate: add one select filter test

Conflicts:
tests/fate/filter-video.mak

Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoMerge commit '305d3d9f1f7f0bdc18744f376a0ff5b012e4e6cf'
Michael Niedermayer [Thu, 21 Nov 2013 17:42:43 +0000 (18:42 +0100)]
Merge commit '305d3d9f1f7f0bdc18744f376a0ff5b012e4e6cf'

* commit '305d3d9f1f7f0bdc18744f376a0ff5b012e4e6cf':
  mpeg4videoenc: restore macro parentheses

No change, as the bug was spoted by ubitux and not merged

Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agocmdutils&ffmpeg: use av_fopen_utf8() for passlogfile
Michael Niedermayer [Fri, 1 Nov 2013 00:15:13 +0000 (01:15 +0100)]
cmdutils&ffmpeg: use av_fopen_utf8() for passlogfile

might fix Ticket3056

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agodct/fft: Give consistent names to fixed/float template files
Diego Biurrun [Tue, 19 Nov 2013 20:17:53 +0000 (21:17 +0100)]
dct/fft: Give consistent names to fixed/float template files

5 years agofilter docs: reference scale and fps filters
Vittorio Giovara [Wed, 20 Nov 2013 16:35:39 +0000 (17:35 +0100)]
filter docs: reference scale and fps filters

5 years agoavconv_filter: add new line after error message
Vittorio Giovara [Wed, 20 Nov 2013 16:58:09 +0000 (17:58 +0100)]
avconv_filter: add new line after error message

5 years agoMerge branch 'master' of https://github.com/upsuper/ffmpeg-vdadec
Michael Niedermayer [Thu, 21 Nov 2013 13:25:47 +0000 (14:25 +0100)]
Merge branch 'master' of https://github.com/upsuper/ffmpeg-vdadec

Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoavcodec/utils: remove unused variable
Michael Niedermayer [Thu, 21 Nov 2013 12:53:36 +0000 (13:53 +0100)]
avcodec/utils: remove unused variable

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agofate: add one select filter test
Vittorio Giovara [Sun, 17 Nov 2013 16:22:56 +0000 (17:22 +0100)]
fate: add one select filter test

This test selects alternate frames from input.

5 years agompeg4videoenc: restore macro parentheses
Vittorio Giovara [Tue, 19 Nov 2013 15:45:51 +0000 (16:45 +0100)]
mpeg4videoenc: restore macro parentheses

These were erroneously removed in 8769113accf1f3b78634dec60b37f7354ed6d88d.