ffmpeg.git
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 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.

5 years agocmdutils: randomize spaces after 69cf626f9.
Clément Bœsch [Thu, 21 Nov 2013 11:52:17 +0000 (12:52 +0100)]
cmdutils: randomize spaces after 69cf626f9.

5 years agoMerge remote-tracking branch 'qatar/master'
Michael Niedermayer [Thu, 21 Nov 2013 11:07:29 +0000 (12:07 +0100)]
Merge remote-tracking branch 'qatar/master'

* qatar/master:
  configure: Avoid requiring c99wrap for working around msys path issues

Conflicts:
configure

Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoMerge commit 'a7b87ca9111bafb220ab94d53ab4e4ed48111800'
Michael Niedermayer [Thu, 21 Nov 2013 10:57:49 +0000 (11:57 +0100)]
Merge commit 'a7b87ca9111bafb220ab94d53ab4e4ed48111800'

* commit 'a7b87ca9111bafb220ab94d53ab4e4ed48111800':
  libxavs: rename and fix a variable name

Conflicts:
libavcodec/libxavs.c

See: 260fc0d95b025b03b2a15116526e4c83b1ca1a31
Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoconfigure: Avoid requiring c99wrap for working around msys path issues
Martin Storsjö [Thu, 14 Nov 2013 09:58:37 +0000 (11:58 +0200)]
configure: Avoid requiring c99wrap for working around msys path issues

Msys is unable to convert unix style absolute paths to windows style
paths when combined with certain multichar MSVC options such as
-Fo<file>. We used to work around this issue by passing them as two
separate parameters separated by a space to c99wrap, which then mapped
them back to the actual parameter format that MSVC uses.

The only paths that actually are an issue are absolute unix style
paths, and the only place such absolute paths are used with the output
arguments (-Fo, -Fe, -Fi, -out:) are for the temp files within configure.

By setting TMPDIR to . for msvc/icl builds, we never need to use
absolute unix style paths for the file output, and we can use the
actual proper form of the file output parameters. This avoids requiring
the c99wrap wrapper for remapping the parameters for cases where the
c99 converter isn't invoked at all (MSVC2013 and ICL).

Signed-off-by: Martin Storsjö <martin@martin.st>
5 years agoavformat/utils: inject audio skip side data before the side data merge code
Michael Niedermayer [Wed, 20 Nov 2013 23:15:05 +0000 (00:15 +0100)]
avformat/utils: inject audio skip side data before the side data merge code

This ensures that its handled the same way as other side data

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoavcodec: move end zeroing code from av_packet_split_side_data() to avcodec_decode_sub...
Michael Niedermayer [Thu, 21 Nov 2013 01:32:37 +0000 (02:32 +0100)]
avcodec: move end zeroing code from av_packet_split_side_data() to avcodec_decode_subtitle2()

This code changes the input packet, which is read only and can in
rare circumstances lead to decoder errors. (i run into one of these in
the audio decoder, which corrupted the packet during av_find_stream_info()
so that actual decoding that single packet failed later)
Until a better fix is implemented, this commit limits the problem.
A better fix might be to make the subtitle decoders not depend on
data[size] = 0 or to copy their input when this is not the case.

5 years agoavformat/utils: move side data merge after parser
Michael Niedermayer [Wed, 20 Nov 2013 23:09:29 +0000 (00:09 +0100)]
avformat/utils: move side data merge after parser

merging before the parser can conflict with the parser, also
future changes depend on it being done later

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agolibxavs: rename and fix a variable name
Sean McGovern [Tue, 19 Nov 2013 21:51:45 +0000 (16:51 -0500)]
libxavs: rename and fix a variable name

It was mis-spelled in b18c7c8d3ddfbf171fe0aba1c201a002920af7f7.

Signed-off-by: Anton Khirnov <anton@khirnov.net>
5 years agoavcodec/avpacket: fix order of operations in case of too large allocation
Michael Niedermayer [Wed, 20 Nov 2013 18:44:21 +0000 (19:44 +0100)]
avcodec/avpacket: fix order of operations in case of too large allocation

Found-by: wm4
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoavcodec/utils: use the unpack_dictionary function
Ben Boeckel [Mon, 18 Nov 2013 01:36:30 +0000 (20:36 -0500)]
avcodec/utils: use the unpack_dictionary function

Signed-off-by: Ben Boeckel <mathstuf@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoavcodec/avpacket: use size_t, fix potential integer overflow
Michael Niedermayer [Wed, 20 Nov 2013 15:47:00 +0000 (16:47 +0100)]
avcodec/avpacket: use size_t, fix potential integer overflow

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoDocument new APIs for av_packet_{un, }pack_dictionary()
Ben Boeckel [Mon, 18 Nov 2013 01:36:31 +0000 (20:36 -0500)]
Document new APIs for av_packet_{un, }pack_dictionary()

Signed-off-by: Ben Boeckel <mathstuf@gmail.com>
Reveiwed-by: wm4
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoavpacket: add pack/unpack functions for AVDictionary
Ben Boeckel [Mon, 18 Nov 2013 01:36:26 +0000 (20:36 -0500)]
avpacket: add pack/unpack functions for AVDictionary

These functions are intended for use with side_data which comes in an
AVPacket.

Signed-off-by: Ben Boeckel <mathstuf@gmail.com>
Reviewed-by: wm4
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoavcodec: add side_data type for updated metadata
Ben Boeckel [Mon, 18 Nov 2013 01:36:25 +0000 (20:36 -0500)]
avcodec: add side_data type for updated metadata

This type is intended to be used to allow codecs to pass updated
metadata to applications.

Signed-off-by: Ben Boeckel <mathstuf@gmail.com>
Reviewed-by: wm4
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoavfilter/showspectrum: use 0 dummies for range in const.
Clément Bœsch [Wed, 20 Nov 2013 15:37:59 +0000 (16:37 +0100)]
avfilter/showspectrum: use 0 dummies for range in const.

This is consistent with other options.

5 years agoavfilter/showspectrum: reindent const options.
Clément Bœsch [Wed, 20 Nov 2013 15:37:34 +0000 (16:37 +0100)]
avfilter/showspectrum: reindent const options.

5 years agoavfilter/showspectrum: add blackman window.
Clément Bœsch [Wed, 20 Nov 2013 15:35:48 +0000 (16:35 +0100)]
avfilter/showspectrum: add blackman window.

5 years agoavfilter/showspectrum: add win_func option.
Clément Bœsch [Wed, 20 Nov 2013 15:20:11 +0000 (16:20 +0100)]
avfilter/showspectrum: add win_func option.

5 years agovda_h264_dec: backup context before overriding
Xidorn Quan [Tue, 19 Nov 2013 00:37:01 +0000 (08:37 +0800)]
vda_h264_dec: backup context before overriding

Some of context fields which must be overrided by this wrapper decoder
may be set and used by user, so we have to save and restore them before
and after invoking the inner decoder to secure user.

5 years agofate: test -mbd rd for h261
Michael Niedermayer [Wed, 20 Nov 2013 14:38:56 +0000 (15:38 +0100)]
fate: test -mbd rd for h261

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoavcodec/h261enc: dont use current_mv_x/y
Michael Niedermayer [Wed, 20 Nov 2013 14:28:46 +0000 (15:28 +0100)]
avcodec/h261enc: dont use current_mv_x/y

Fixes -mbd rd
Fixes Ticket3151

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoavcodec/h261enc: avoid use of current/previous_mba
Michael Niedermayer [Wed, 20 Nov 2013 14:11:21 +0000 (15:11 +0100)]
avcodec/h261enc: avoid use of current/previous_mba

Fixes part of Ticket3151

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoMerge remote-tracking branch 'qatar/master'
Michael Niedermayer [Wed, 20 Nov 2013 03:21:31 +0000 (04:21 +0100)]
Merge remote-tracking branch 'qatar/master'

* qatar/master:
  win{32,64}: Hard disable symbol versioning

Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoMerge commit 'ffb0af7f17eb0da86e9b140e86a1404d3c6c9e79'
Michael Niedermayer [Wed, 20 Nov 2013 03:13:17 +0000 (04:13 +0100)]
Merge commit 'ffb0af7f17eb0da86e9b140e86a1404d3c6c9e79'

* commit 'ffb0af7f17eb0da86e9b140e86a1404d3c6c9e79':
  ac3dec: simplify an expression

Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoffmpeg: fix do_streamcopy() so it copies side data too
Michael Niedermayer [Tue, 19 Nov 2013 23:14:48 +0000 (00:14 +0100)]
ffmpeg: fix do_streamcopy() so it copies side data too

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoavcodec/avpacket: correctly set the number of side data elements in av_copy_packet_si...
Michael Niedermayer [Tue, 19 Nov 2013 23:14:06 +0000 (00:14 +0100)]
avcodec/avpacket: correctly set the number of side data elements in av_copy_packet_side_data()

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agocmdutils: cosmetics
Michael Niedermayer [Tue, 19 Nov 2013 22:30:04 +0000 (23:30 +0100)]
cmdutils: cosmetics

requested by multiple people

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agodoc/muxers/segment: remove wrong default indication for segment_list_flags option
Stefano Sabatini [Tue, 19 Nov 2013 22:23:48 +0000 (23:23 +0100)]
doc/muxers/segment: remove wrong default indication for segment_list_flags option

5 years agoswscale/x86: SIMD deinterleaveBytes() depends on YASM
Michael Niedermayer [Tue, 19 Nov 2013 21:36:27 +0000 (22:36 +0100)]
swscale/x86: SIMD deinterleaveBytes() depends on YASM

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agowin{32,64}: Hard disable symbol versioning
Derek Buitenhuis [Tue, 19 Nov 2013 17:53:00 +0000 (17:53 +0000)]
win{32,64}: Hard disable symbol versioning

ICL doesn't return an error on unknown parameters, and will
always pass the symver_gnu_asm test, and since Windows
never has symbol versioning, just always disable it.

Signed-off-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
5 years agocmdutils: Add -buildconf option.
Stephen Hutchinson [Sun, 11 Aug 2013 16:17:57 +0000 (12:17 -0400)]
cmdutils: Add -buildconf option.

The output is formatted to display one option per line.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoMerge remote-tracking branch 'qatar/master'
Michael Niedermayer [Tue, 19 Nov 2013 17:29:22 +0000 (18:29 +0100)]
Merge remote-tracking branch 'qatar/master'

* qatar/master:
  dv_tablegen: Remove CONFIG_SMALL preprocessor check

Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoriff: add DYM4 mpeg4 fourcc
Compn [Tue, 19 Nov 2013 19:24:25 +0000 (14:24 -0500)]
riff: add DYM4 mpeg4 fourcc

5 years agoac3dec: simplify an expression
Tim Walker [Mon, 18 Nov 2013 11:41:47 +0000 (12:41 +0100)]
ac3dec: simplify an expression

Signed-off-by: Diego Biurrun <diego@biurrun.de>
5 years agoMerge commit '6f1ec8edf2416441e2348f3a0915c9fee179d7da'
Michael Niedermayer [Tue, 19 Nov 2013 17:18:47 +0000 (18:18 +0100)]
Merge commit '6f1ec8edf2416441e2348f3a0915c9fee179d7da'

* commit '6f1ec8edf2416441e2348f3a0915c9fee179d7da':
  avcodec.h: include version.h before using version macro

Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoavfilter/vf_tinterlace: check clone return value
Michael Niedermayer [Tue, 19 Nov 2013 17:08:58 +0000 (18:08 +0100)]
avfilter/vf_tinterlace: check clone return value

Inspired by: 3a16ec19d2426457419cb8a7304f97982699efda

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoMerge commit '3a16ec19d2426457419cb8a7304f97982699efda'
Michael Niedermayer [Tue, 19 Nov 2013 17:06:22 +0000 (18:06 +0100)]
Merge commit '3a16ec19d2426457419cb8a7304f97982699efda'

* commit '3a16ec19d2426457419cb8a7304f97982699efda':
  vf_interlace: check one av_frame_clone allocation

Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoMerge commit 'c673fc919c374c60b1e6d80d8822712eadf67f16'
Michael Niedermayer [Tue, 19 Nov 2013 16:59:47 +0000 (17:59 +0100)]
Merge commit 'c673fc919c374c60b1e6d80d8822712eadf67f16'

* commit 'c673fc919c374c60b1e6d80d8822712eadf67f16':
  hevc_sei: drop unused parameter

Conflicts:
libavcodec/hevc_sei.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoMerge commit 'd234c7a07c1313fd215e8e242492bf71f5f3321e'
Michael Niedermayer [Tue, 19 Nov 2013 15:52:23 +0000 (16:52 +0100)]
Merge commit 'd234c7a07c1313fd215e8e242492bf71f5f3321e'

* commit 'd234c7a07c1313fd215e8e242492bf71f5f3321e':
  mpeg4videodec: K&R formatting cosmetics

Conflicts:
libavcodec/mpeg4videodec.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoMerge commit '8769113accf1f3b78634dec60b37f7354ed6d88d'
Michael Niedermayer [Tue, 19 Nov 2013 14:47:44 +0000 (15:47 +0100)]
Merge commit '8769113accf1f3b78634dec60b37f7354ed6d88d'

* commit '8769113accf1f3b78634dec60b37f7354ed6d88d':
  mpeg4videoenc: K&R formatting cosmetics

Conflicts:
libavcodec/mpeg4videoenc.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agodv_tablegen: Remove CONFIG_SMALL preprocessor check
Diego Biurrun [Sun, 10 Nov 2013 21:12:55 +0000 (22:12 +0100)]
dv_tablegen: Remove CONFIG_SMALL preprocessor check

The code does in no way depend on CONFIG_SMALL.

5 years agoswscale/x86/rgb2rgb_template: add mmx/sse2/avx optimized deinterleaveBytes
Michael Niedermayer [Tue, 19 Nov 2013 13:57:52 +0000 (14:57 +0100)]
swscale/x86/rgb2rgb_template: add mmx/sse2/avx optimized deinterleaveBytes

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoswscale/x86/rgb2rgb: change cpu optim identifiers to lower case
Michael Niedermayer [Tue, 19 Nov 2013 13:54:58 +0000 (14:54 +0100)]
swscale/x86/rgb2rgb: change cpu optim identifiers to lower case

This makes the code more similar to the other optims and allows us
to use the same macros to build function names

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoswscale/x86/rgb2rgb: extend framework to also include AVX
Michael Niedermayer [Tue, 19 Nov 2013 13:46:01 +0000 (14:46 +0100)]
swscale/x86/rgb2rgb: extend framework to also include AVX

This does not yet include any actual AVX code

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoswscale: fix used stride in planarToNv12Wrapper()
Michael Niedermayer [Tue, 19 Nov 2013 13:19:22 +0000 (14:19 +0100)]
swscale: fix used stride in planarToNv12Wrapper()

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoswscale: add nv12/nv21->yuv420 converter
Michael Niedermayer [Tue, 19 Nov 2013 13:17:26 +0000 (14:17 +0100)]
swscale: add nv12/nv21->yuv420 converter

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoavcodec.h: include version.h before using version macro
Vittorio Giovara [Mon, 18 Nov 2013 16:02:04 +0000 (17:02 +0100)]
avcodec.h: include version.h before using version macro

5 years agovf_interlace: check one av_frame_clone allocation
Vittorio Giovara [Mon, 11 Nov 2013 00:04:17 +0000 (01:04 +0100)]
vf_interlace: check one av_frame_clone allocation

5 years agohevc_sei: drop unused parameter
Vittorio Giovara [Sun, 10 Nov 2013 23:29:51 +0000 (00:29 +0100)]
hevc_sei: drop unused parameter

5 years agompeg4videodec: K&R formatting cosmetics
Vittorio Giovara [Mon, 28 Oct 2013 17:30:13 +0000 (18:30 +0100)]
mpeg4videodec: K&R formatting cosmetics

5 years agompeg4videoenc: K&R formatting cosmetics
Vittorio Giovara [Mon, 28 Oct 2013 17:30:01 +0000 (18:30 +0100)]
mpeg4videoenc: K&R formatting cosmetics

5 years agoavformat/jacosubdec: make probing less tolerant.
Clément Bœsch [Tue, 19 Nov 2013 11:53:14 +0000 (12:53 +0100)]
avformat/jacosubdec: make probing less tolerant.

Fixes a failure with probetest:
  ./tools/probetest 8192 500000
  [...]
  Failure of jacosub probing code with score=51 type=1 p=CAB size=16

Random data was:
  00000000  40 37 40 30 93 01 48 e0 09 96 10 90 78 0f 0c 10 @7@0..H.....x...

5 years agoMerge remote-tracking branch 'qatar/master'
Michael Niedermayer [Tue, 19 Nov 2013 10:34:08 +0000 (11:34 +0100)]
Merge remote-tracking branch 'qatar/master'

* qatar/master:
  configure: Don't use symlinks for creating the out of tree makefile

Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agodoc/examples: fix mem issues in filtering_video.
Clément Bœsch [Tue, 19 Nov 2013 09:31:39 +0000 (10:31 +0100)]
doc/examples: fix mem issues in filtering_video.

5 years agoconfigure: Don't use symlinks for creating the out of tree makefile
Martin Storsjö [Thu, 14 Nov 2013 11:22:11 +0000 (13:22 +0200)]
configure: Don't use symlinks for creating the out of tree makefile

On some platforms (such as msys), symlinks are (poorly) emulated
by simply creating a copy of the file.

This means that when building out of tree, the build tree gets
a copy of the original makefile, which can lead to unintuitive
build errors when the original makefile gets updated later.

Instead simply create a stub makefile which includes the real
one.

Signed-off-by: Martin Storsjö <martin@martin.st>
5 years agoMerge remote-tracking branch 'qatar/master'
Michael Niedermayer [Tue, 19 Nov 2013 03:15:09 +0000 (04:15 +0100)]
Merge remote-tracking branch 'qatar/master'

* qatar/master:
  mpegvideo: Fix swapping of UV planes for VCR2

See: bae14f38d992f326c94d93f01197ccd84ea62053
Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoMerge commit '69d4dbfd1faa99563065329656bbe597d612ca03'
Michael Niedermayer [Tue, 19 Nov 2013 03:09:37 +0000 (04:09 +0100)]
Merge commit '69d4dbfd1faa99563065329656bbe597d612ca03'

* commit '69d4dbfd1faa99563065329656bbe597d612ca03':
  aac_ac3_parser: simplify an expression

Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoMerge commit '37a3cac78c6b13dc4e2c4f33ef53eed722d6f7b9'
Michael Niedermayer [Tue, 19 Nov 2013 03:02:41 +0000 (04:02 +0100)]
Merge commit '37a3cac78c6b13dc4e2c4f33ef53eed722d6f7b9'

* commit '37a3cac78c6b13dc4e2c4f33ef53eed722d6f7b9':
  dcadec: simplify an expression

Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoMerge commit 'a553c6a347d3d28d7ee44c3df3d5c4ee780dba23'
Michael Niedermayer [Tue, 19 Nov 2013 02:48:15 +0000 (03:48 +0100)]
Merge commit 'a553c6a347d3d28d7ee44c3df3d5c4ee780dba23'

* commit 'a553c6a347d3d28d7ee44c3df3d5c4ee780dba23':
  lavc: use buf[0] instead of data[0] in checks whether a frame is allocated

Conflicts:
libavcodec/h264_refs.c
libavcodec/mpegvideo.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agompegvideo: Fix swapping of UV planes for VCR2
Kostya Shishkov [Wed, 13 Nov 2013 17:44:26 +0000 (18:44 +0100)]
mpegvideo: Fix swapping of UV planes for VCR2

5 years agoaac_ac3_parser: simplify an expression
Tim Walker [Mon, 18 Nov 2013 11:41:46 +0000 (12:41 +0100)]
aac_ac3_parser: simplify an expression

Signed-off-by: Diego Biurrun <diego@biurrun.de>
5 years agodcadec: simplify an expression
Tim Walker [Mon, 18 Nov 2013 11:41:43 +0000 (12:41 +0100)]
dcadec: simplify an expression

Signed-off-by: Diego Biurrun <diego@biurrun.de>
5 years agoavcodec/asvenc: remove code allocating dummy coded_frame
Michael Niedermayer [Mon, 18 Nov 2013 22:21:20 +0000 (23:21 +0100)]
avcodec/asvenc: remove code allocating dummy coded_frame

Fixes memleak

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoavcodec/pcm-dvd: print actual block size values in block size changed warning
Michael Niedermayer [Mon, 18 Nov 2013 19:59:21 +0000 (20:59 +0100)]
avcodec/pcm-dvd: print actual block size values in block size changed warning

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoavcodec/pcm-dvd: fix incorrectly printed warning about changed block sizes
Michael Niedermayer [Mon, 18 Nov 2013 19:58:35 +0000 (20:58 +0100)]
avcodec/pcm-dvd: fix incorrectly printed warning about changed block sizes

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoavcodec/pcm-dvd: fix 20/24bit 1 channel
Michael Niedermayer [Mon, 18 Nov 2013 19:56:40 +0000 (20:56 +0100)]
avcodec/pcm-dvd: fix 20/24bit 1 channel

Fixes part of ticket3122

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoavcodec/pcm-dvd: fix 20bit 2 channels
Michael Niedermayer [Mon, 18 Nov 2013 19:56:40 +0000 (20:56 +0100)]
avcodec/pcm-dvd: fix 20bit 2 channels

Fixes part of ticket3122

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoAdd a lavc Makefile dependency for the elbg filter.
Carl Eugen Hoyos [Mon, 18 Nov 2013 17:05:30 +0000 (18:05 +0100)]
Add a lavc Makefile dependency for the elbg filter.

Fixes compilation with --disable-encoders

Reported by trac user Julian in ticket #3140.

5 years agolavc: use buf[0] instead of data[0] in checks whether a frame is allocated
Anton Khirnov [Fri, 1 Nov 2013 17:07:22 +0000 (18:07 +0100)]
lavc: use buf[0] instead of data[0] in checks whether a frame is allocated

data[0] may be NULL for valid frames with hwaccel pixel formats.

5 years agoAdd a Makefile rule for the little-endian G.726 decoder.
Carl Eugen Hoyos [Mon, 18 Nov 2013 16:51:28 +0000 (17:51 +0100)]
Add a Makefile rule for the little-endian G.726 decoder.

Fixes compilation with --disable-everything --enable-decoder=adpcm_g726le

5 years agoAdd decoder dependency to the HEVC parser.
Carl Eugen Hoyos [Mon, 18 Nov 2013 16:48:17 +0000 (17:48 +0100)]
Add decoder dependency to the HEVC parser.

Fixes compilation with --disable-everything --enable-parser=hevc

5 years agoavformat/mpegts: fix resync seek
Michael Niedermayer [Mon, 18 Nov 2013 15:38:12 +0000 (16:38 +0100)]
avformat/mpegts: fix resync seek

The seek ended up seeking before the begin, which caused problems
Fixes initial sync issues with libbluray
Fixes Ticket3117

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoMerge remote-tracking branch 'qatar/master'
Michael Niedermayer [Mon, 18 Nov 2013 15:02:09 +0000 (16:02 +0100)]
Merge remote-tracking branch 'qatar/master'

* qatar/master:
  rtmphttp: Check for both 0 and AVERROR_EOF

Conflicts:
libavformat/rtmphttp.c

See: d04b7de786780747878c080ba522405c6f542ccb
Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agortmphttp: Check for both 0 and AVERROR_EOF
Valeriy Argunov [Fri, 15 Nov 2013 17:33:43 +0000 (00:33 +0700)]
rtmphttp: Check for both 0 and AVERROR_EOF

This makes RTMPT work again - it was broken by 5d876be87a.

Signed-off-by: Martin Storsjö <martin@martin.st>
5 years agoavcodec/libopusenc: change default frame duration to 20 ms
Paul B Mahol [Fri, 15 Nov 2013 01:09:06 +0000 (01:09 +0000)]
avcodec/libopusenc: change default frame duration to 20 ms

20 ms is used by libopus encoder.

Signed-off-by: Paul B Mahol <onemda@gmail.com>
5 years agoavcodec/h261enc: remove unused variables
Michael Niedermayer [Mon, 18 Nov 2013 09:04:17 +0000 (10:04 +0100)]
avcodec/h261enc: remove unused variables

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoavcodec/libxavs: 2nd attempt to fix compilation after b18c7c8d.
Clément Bœsch [Mon, 18 Nov 2013 07:08:41 +0000 (08:08 +0100)]
avcodec/libxavs: 2nd attempt to fix compilation after b18c7c8d.

5 years agoavcodec/libxavs: attempt to fix compilation after b18c7c8d.
Clément Bœsch [Mon, 18 Nov 2013 06:53:08 +0000 (07:53 +0100)]
avcodec/libxavs: attempt to fix compilation after b18c7c8d.

5 years agoavformat/utils: dont count attached pics toward the probesize
Michael Niedermayer [Mon, 18 Nov 2013 02:02:36 +0000 (03:02 +0100)]
avformat/utils: dont count attached pics toward the probesize

Such pics behave more like headers which we also dont count.
Fixes Ticket3146

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoavfilter/vf_mp: fix missing FF_API_XVMC check
Vallimar [Mon, 18 Nov 2013 00:21:28 +0000 (01:21 +0100)]
avfilter/vf_mp: fix missing FF_API_XVMC check

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoavcodec/old_codec_ids: fix missing FF_API_XVMC check
Vallimar [Mon, 18 Nov 2013 00:21:28 +0000 (01:21 +0100)]
avcodec/old_codec_ids: fix missing FF_API_XVMC check

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoavcodec/x86: remove 3 sub in pred4x4_tm_vp8_8.
Clément Bœsch [Sun, 17 Nov 2013 22:00:23 +0000 (23:00 +0100)]
avcodec/x86: remove 3 sub in pred4x4_tm_vp8_8.

before:
  411 decicycles in ff_pred4x4_tm_vp8_8_ssse3, 8388289 runs, 319 skips

after:
  389 decicycles in ff_pred4x4_tm_vp8_8_ssse3, 8388308 runs, 300 skips

Tested on i7 920.

5 years agoqpeg: remove faulty avcodec_get_frame_defaults()
Michael Niedermayer [Sun, 17 Nov 2013 20:20:17 +0000 (21:20 +0100)]
qpeg: remove faulty avcodec_get_frame_defaults()

Found-by: {V}
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>