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

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