ffmpeg.git
6 years agoavisynth: Remove outdated undef block
Stephen Hutchinson [Mon, 28 Oct 2013 20:52:49 +0000 (16:52 -0400)]
avisynth: Remove outdated undef block

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoavisynth: Remove a couple of useless AviSynthContext casts
Stephen Hutchinson [Mon, 28 Oct 2013 20:52:48 +0000 (16:52 -0400)]
avisynth: Remove a couple of useless AviSynthContext casts

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoavisynth: Don't declare structs anonymously
Stephen Hutchinson [Mon, 28 Oct 2013 20:52:47 +0000 (16:52 -0400)]
avisynth: Don't declare structs anonymously

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoavisynth: Compact AvxSynth's avoidance of 2.6's colorspaces.
Stephen Hutchinson [Mon, 28 Oct 2013 20:52:46 +0000 (16:52 -0400)]
avisynth: Compact AvxSynth's avoidance of 2.6's colorspaces.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoavisynth: Cosmetics
Stephen Hutchinson [Mon, 28 Oct 2013 20:52:45 +0000 (16:52 -0400)]
avisynth: Cosmetics

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoavisynth: Change most of the comments to /* */ from //
Stephen Hutchinson [Mon, 28 Oct 2013 20:52:44 +0000 (16:52 -0400)]
avisynth: Change most of the comments to /* */ from //

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoavisynth: Introduce USING_AVISYNTH macro
Stephen Hutchinson [Mon, 28 Oct 2013 20:52:43 +0000 (16:52 -0400)]
avisynth: Introduce USING_AVISYNTH macro

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agompegts: demux synchronous SMPTE 336M Key-Length-Value (KLV) metadata
Peter Ross [Tue, 5 Feb 2013 11:01:11 +0000 (22:01 +1100)]
mpegts: demux synchronous SMPTE 336M Key-Length-Value (KLV) metadata

Fixes ticket #2579.

6 years agoavutil/opt: check flags validity in write_number()
Michael Niedermayer [Mon, 28 Oct 2013 16:39:07 +0000 (17:39 +0100)]
avutil/opt: check flags validity in write_number()

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoavcodec/h263dec: fix handling of AV_EF_EXPLODE
Michael Niedermayer [Mon, 28 Oct 2013 16:05:59 +0000 (17:05 +0100)]
avcodec/h263dec: fix handling of AV_EF_EXPLODE

This fixes checking a variable that had been overwritten before.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoMerge remote-tracking branch 'qatar/master'
Michael Niedermayer [Mon, 28 Oct 2013 13:30:31 +0000 (14:30 +0100)]
Merge remote-tracking branch 'qatar/master'

* qatar/master:
  ac3dec: fix outptr increment.

Conflicts:
libavcodec/ac3dec.c

No change as this has been fixed in ffmpeg head already

Merged-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoMerge commit 'a1c5cc429d99216406170eac7e8352860076d3e8'
Michael Niedermayer [Mon, 28 Oct 2013 12:55:06 +0000 (13:55 +0100)]
Merge commit 'a1c5cc429d99216406170eac7e8352860076d3e8'

* commit 'a1c5cc429d99216406170eac7e8352860076d3e8':
  lavc: don't set AVFrame.pts to random numbers in decoders.

Conflicts:
libavcodec/mpeg4videodec.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoMerge commit '2ba68dd044ca8fc591139c05563840f546a9c0c0'
Michael Niedermayer [Mon, 28 Oct 2013 12:27:57 +0000 (13:27 +0100)]
Merge commit '2ba68dd044ca8fc591139c05563840f546a9c0c0'

* commit '2ba68dd044ca8fc591139c05563840f546a9c0c0':
  lavf: remove unreliable timestamp guessing heuristic

Conflicts:
libavformat/utils.c

Not merged, as the change breaks ABI by removing a field from the middle
of AVStream.
Also, if you have files that decode better or worse without this code please
open a ticket on trac. If the timestamp code turns out useless it of course
should be removed.

Merged-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoac3dec: fix outptr increment.
Michael Niedermayer [Fri, 25 Oct 2013 22:46:53 +0000 (18:46 -0400)]
ac3dec: fix outptr increment.

Fixes corrupt data errors when downmixing in the AC-3 decoder.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Signed-off-by: Justin Ruggles <justin.ruggles@gmail.com>
CC:libav-stable@libav.org

6 years agoMerge commit 'f2521563d1a0c3e2a21892f59f3327b82b3db7fc'
Michael Niedermayer [Mon, 28 Oct 2013 12:21:07 +0000 (13:21 +0100)]
Merge commit 'f2521563d1a0c3e2a21892f59f3327b82b3db7fc'

* commit 'f2521563d1a0c3e2a21892f59f3327b82b3db7fc':
  g722dec: Change bits_per_codeword to the right option type

Merged-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoMerge commit '884c7a6eb86a9bc05abafc058b279018ded7de5f'
Michael Niedermayer [Mon, 28 Oct 2013 12:13:23 +0000 (13:13 +0100)]
Merge commit '884c7a6eb86a9bc05abafc058b279018ded7de5f'

* commit '884c7a6eb86a9bc05abafc058b279018ded7de5f':
  avfilter: fix const use of avfilter_next

See: d94c90700863ce3c0bb87e8e590396b919880a6f
See: e4723a82f7088f5d4ab32ada529c3f69ba3606b0
Merged-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoMerge commit '5c439b41d0489412c0a4cf6dfb98915251677b8e'
Michael Niedermayer [Mon, 28 Oct 2013 12:07:05 +0000 (13:07 +0100)]
Merge commit '5c439b41d0489412c0a4cf6dfb98915251677b8e'

* commit '5c439b41d0489412c0a4cf6dfb98915251677b8e':
  avfilter: have avfilter_get_by_name return const for next bump

Conflicts:
libavfilter/version.h

Merged-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoMerge commit '97de206b44a48da726807cc3e7b9448a8112760b'
Michael Niedermayer [Mon, 28 Oct 2013 11:47:10 +0000 (12:47 +0100)]
Merge commit '97de206b44a48da726807cc3e7b9448a8112760b'

* commit '97de206b44a48da726807cc3e7b9448a8112760b':
  lavc: disable CRC checking by default

Conflicts:
libavcodec/options_table.h

Merged-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoMerge commit '23a211cbba0b7c9ee694040031b2e5da1be54a00'
Michael Niedermayer [Mon, 28 Oct 2013 11:34:35 +0000 (12:34 +0100)]
Merge commit '23a211cbba0b7c9ee694040031b2e5da1be54a00'

* commit '23a211cbba0b7c9ee694040031b2e5da1be54a00':
  lavc: change all decoders to behave consistently with AV_EF_CRCCHECK.

Conflicts:
libavcodec/avcodec.h
libavcodec/tta.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoMerge commit 'f354f30836a3148275ce60d19bbc581310249ad2'
Michael Niedermayer [Mon, 28 Oct 2013 11:26:31 +0000 (12:26 +0100)]
Merge commit 'f354f30836a3148275ce60d19bbc581310249ad2'

* commit 'f354f30836a3148275ce60d19bbc581310249ad2':
  error resilience: check error_concealment, not err_recognition.

Conflicts:
libavcodec/error_resilience.c

See: 346e09638cc159a3c3e4cf971a5b795644faac16
Merged-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoMerge commit '53151723e377b9c43f876e20d7f27a17993256c8'
Michael Niedermayer [Mon, 28 Oct 2013 11:17:57 +0000 (12:17 +0100)]
Merge commit '53151723e377b9c43f876e20d7f27a17993256c8'

* commit '53151723e377b9c43f876e20d7f27a17993256c8':
  avio: K&R formatting cosmetics

Conflicts:
libavformat/avio.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoMerge commit 'aaaf2dc023d31f30eeec874f24b50f44b9295185'
Michael Niedermayer [Mon, 28 Oct 2013 11:07:23 +0000 (12:07 +0100)]
Merge commit 'aaaf2dc023d31f30eeec874f24b50f44b9295185'

* commit 'aaaf2dc023d31f30eeec874f24b50f44b9295185':
  h263: Check init_get_bits return value

Conflicts:
libavcodec/h263dec.c

See: d47e14b53a3908e5bad82e22129bbd175b49e89b
Merged-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoMerge commit '0749314886390f6ec81d45e0ba424fcb36c945cf'
Michael Niedermayer [Mon, 28 Oct 2013 10:54:46 +0000 (11:54 +0100)]
Merge commit '0749314886390f6ec81d45e0ba424fcb36c945cf'

* commit '0749314886390f6ec81d45e0ba424fcb36c945cf':
  h263: Return meaningful errors

Conflicts:
libavcodec/h263dec.c

See: 7b62d3415e8e44618cb97775567d453295c4f4d9
Merged-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoMerge commit 'de6061203e2d509579ab110fb1873aade34320f5'
Michael Niedermayer [Mon, 28 Oct 2013 10:32:16 +0000 (11:32 +0100)]
Merge commit 'de6061203e2d509579ab110fb1873aade34320f5'

* commit 'de6061203e2d509579ab110fb1873aade34320f5':
  configure: Disable -Wmaybe-uninitialized by default

Merged-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoMerge commit '0b357a8095e72b092cc5c2aacc2f806db75ecae3'
Michael Niedermayer [Mon, 28 Oct 2013 10:26:48 +0000 (11:26 +0100)]
Merge commit '0b357a8095e72b092cc5c2aacc2f806db75ecae3'

* commit '0b357a8095e72b092cc5c2aacc2f806db75ecae3':
  AVOptions: do not range check flag options.

Conflicts:
libavutil/opt.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoMerge commit '94603feb1b3ad01a821a1a1cef1570b13f471821'
Michael Niedermayer [Mon, 28 Oct 2013 10:01:11 +0000 (11:01 +0100)]
Merge commit '94603feb1b3ad01a821a1a1cef1570b13f471821'

* commit '94603feb1b3ad01a821a1a1cef1570b13f471821':
  h264_ps: when parsing a VUI fails, only abort when explode is set

Merge only for metadata, ignoring invalid data can put the context
into an invalid state and can possibly be used for remote code
execution exploits.
Also we support all non standard VUIs that have been reported so
ignoring parsing failure makes no sense for us unless theres
some issue that has not been reported

Merged-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoMerge commit '79ef4b19bfcab8b984682a53bb8561e5c8324731'
Michael Niedermayer [Mon, 28 Oct 2013 09:53:33 +0000 (10:53 +0100)]
Merge commit '79ef4b19bfcab8b984682a53bb8561e5c8324731'

* commit '79ef4b19bfcab8b984682a53bb8561e5c8324731':
  FATE: add bitexact sws flags to the fieldorder test

See: 3a75c4e93b3b6f1aeb9343b933ff15776b5b4b41
Merged-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoMerge commit 'ddc589ce98c2bba1e59318b5b0224717325eac46'
Michael Niedermayer [Mon, 28 Oct 2013 09:46:36 +0000 (10:46 +0100)]
Merge commit 'ddc589ce98c2bba1e59318b5b0224717325eac46'

* commit 'ddc589ce98c2bba1e59318b5b0224717325eac46':
  avconv: drop a now useless variable

Merged-by: Michael Niedermayer <michaelni@gmx.at>
6 years agohevc: add profile idc warning
Mickaël Raulet [Mon, 28 Oct 2013 08:46:05 +0000 (09:46 +0100)]
hevc: add profile idc warning
(cherry picked from commit 15f7a481fd19529b13631bfff5b3d65bfe5729d5)

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agohevc: refactor pic_arrays and set_sps
Anton Khirnov [Sun, 27 Oct 2013 23:40:34 +0000 (00:40 +0100)]
hevc: refactor pic_arrays and set_sps
(cherry picked from commit a6686c6d83b50c0962269f2c487f4f0c57e0df79)

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agohevc: add irap checks
Anton Khirnov [Sun, 27 Oct 2013 23:27:35 +0000 (00:27 +0100)]
hevc: add irap checks
(cherry picked from commit 3d3bbe35541a308937d0fe72b20a1c29d1c4100d)

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoMerge commit '529a9893d769f381b72785c500662be2020da5fe'
Michael Niedermayer [Mon, 28 Oct 2013 09:28:29 +0000 (10:28 +0100)]
Merge commit '529a9893d769f381b72785c500662be2020da5fe'

* commit '529a9893d769f381b72785c500662be2020da5fe':
  avframe: mark source frame const in _ref and _clone

Merged-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoMerge commit 'fc06ee6ee377cc3b512dff8f02057e26311bc4da'
Michael Niedermayer [Mon, 28 Oct 2013 09:09:47 +0000 (10:09 +0100)]
Merge commit 'fc06ee6ee377cc3b512dff8f02057e26311bc4da'

* commit 'fc06ee6ee377cc3b512dff8f02057e26311bc4da':
  mmvideo: fix uninitialized variable use in mm_decode_intra

Conflicts:
libavcodec/mmvideo.c

See: c2e3b564b32d596f5a66d47409f9e07a067a3084
Merged-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoMerge commit '211ca69b13eb0a127a9ef7e70ddaccdab125d1c5'
Michael Niedermayer [Mon, 28 Oct 2013 08:59:49 +0000 (09:59 +0100)]
Merge commit '211ca69b13eb0a127a9ef7e70ddaccdab125d1c5'

* commit '211ca69b13eb0a127a9ef7e70ddaccdab125d1c5':
  lavr: check that current_buffer is not NULL before using it

Merged-by: Michael Niedermayer <michaelni@gmx.at>
6 years agocmdutils: fix expected signature for show_colors() function n2.2-dev
Stefano Sabatini [Mon, 28 Oct 2013 08:39:38 +0000 (09:39 +0100)]
cmdutils: fix expected signature for show_colors() function

Fix warning:
In file included from ffprobe.c:2557:0:
cmdutils_common_opts.h:17:5: warning: initialization from incompatible pointer type [enabled by default]
cmdutils_common_opts.h:17:5: warning: (near initialization for ‘real_options[16].u.func_arg’) [enabled by default]

Spotted-by: Paul B Mahol
6 years agolavc: don't set AVFrame.pts to random numbers in decoders.
Anton Khirnov [Sun, 27 Oct 2013 14:33:37 +0000 (15:33 +0100)]
lavc: don't set AVFrame.pts to random numbers in decoders.

6 years agolavf: remove unreliable timestamp guessing heuristic
Anton Khirnov [Sun, 27 Oct 2013 20:04:20 +0000 (21:04 +0100)]
lavf: remove unreliable timestamp guessing heuristic

6 years agog722dec: Change bits_per_codeword to the right option type
Martin Storsjö [Sun, 27 Oct 2013 19:57:06 +0000 (21:57 +0200)]
g722dec: Change bits_per_codeword to the right option type

This isn't a set of flags but just a plain integer in the range
6-8.

Signed-off-by: Martin Storsjö <martin@martin.st>
6 years agoavfilter: fix const use of avfilter_next
Vittorio Giovara [Mon, 28 Oct 2013 01:58:13 +0000 (02:58 +0100)]
avfilter: fix const use of avfilter_next

Signed-off-by: Anton Khirnov <anton@khirnov.net>
6 years agoavfilter: have avfilter_get_by_name return const for next bump
Vittorio Giovara [Mon, 28 Oct 2013 01:58:12 +0000 (02:58 +0100)]
avfilter: have avfilter_get_by_name return const for next bump

Signed-off-by: Anton Khirnov <anton@khirnov.net>
6 years agolavc: disable CRC checking by default
Anton Khirnov [Mon, 21 Oct 2013 14:48:59 +0000 (16:48 +0200)]
lavc: disable CRC checking by default

6 years agolavc: change all decoders to behave consistently with AV_EF_CRCCHECK.
Anton Khirnov [Sat, 26 Oct 2013 20:46:48 +0000 (22:46 +0200)]
lavc: change all decoders to behave consistently with AV_EF_CRCCHECK.

Just crccheck prints a warning, crccheck+explode returns an error.

Also document this behavior.

6 years agoerror resilience: check error_concealment, not err_recognition.
Anton Khirnov [Fri, 25 Oct 2013 05:19:27 +0000 (07:19 +0200)]
error resilience: check error_concealment, not err_recognition.

err_recognition is supposed to trigger detecting and reporting errors,
not trying to fix them.

6 years agodoc/RELEASE_NOTES: update for 2.1
Michael Niedermayer [Mon, 28 Oct 2013 00:13:46 +0000 (01:13 +0100)]
doc/RELEASE_NOTES: update for 2.1

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoavdevice/pulse_audio_enc: remove double ;
Michael Niedermayer [Sun, 27 Oct 2013 23:52:11 +0000 (00:52 +0100)]
avdevice/pulse_audio_enc: remove double ;

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agodoc/APIchanges: add 2 missing hashes & versions
Michael Niedermayer [Sun, 27 Oct 2013 23:45:19 +0000 (00:45 +0100)]
doc/APIchanges: add 2 missing hashes & versions

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoMAINTAINERS: update which releases i maintain
Michael Niedermayer [Sun, 27 Oct 2013 23:40:15 +0000 (00:40 +0100)]
MAINTAINERS: update which releases i maintain

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoChangelog: add 2.1
Michael Niedermayer [Sun, 27 Oct 2013 23:39:34 +0000 (00:39 +0100)]
Changelog: add 2.1

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoavio: K&R formatting cosmetics
Luca Barbato [Sun, 27 Oct 2013 13:45:01 +0000 (14:45 +0100)]
avio: K&R formatting cosmetics

6 years agoh263: Check init_get_bits return value
Michael Niedermayer [Sat, 26 Oct 2013 17:02:34 +0000 (19:02 +0200)]
h263: Check init_get_bits return value

And use init_get_bits8 to check for integer overflows while at it.

CC: libav-stable@libav.org
Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
6 years agoh263: Return meaningful errors
Luca Barbato [Sat, 26 Oct 2013 17:31:46 +0000 (19:31 +0200)]
h263: Return meaningful errors

6 years agoconfigure: Disable -Wmaybe-uninitialized by default
Luca Barbato [Sat, 26 Oct 2013 19:27:48 +0000 (21:27 +0200)]
configure: Disable -Wmaybe-uninitialized by default

It is by definition unreliable and causes pointless noise on valid
code.

6 years agohevc: add decode hrd
Mickaël Raulet [Sun, 27 Oct 2013 18:33:05 +0000 (19:33 +0100)]
hevc: add decode hrd
(cherry picked from commit ab4061dff796b1dd2bc884101226aab48c2c875e)

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agohevc: better mt implementation
Anton Khirnov [Sun, 27 Oct 2013 15:50:20 +0000 (16:50 +0100)]
hevc: better mt implementation

Signed-off-by: Mickaël Raulet <mraulet@insa-rennes.fr>
(cherry picked from commit 93afb8c519deca85b3c97804927de5b016dd32d1)
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agohevc: clean up mvs(cherry picked from commit 955317c09b877a513d3fcfcd1615909b2f4f651c)
Mickaël Raulet [Sun, 27 Oct 2013 15:50:20 +0000 (16:50 +0100)]
hevc: clean up mvs(cherry picked from commit 955317c09b877a513d3fcfcd1615909b2f4f651c)

Decreases the difference to Anton Khirnovs patch v5

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agohevc: cosmetic change(cherry picked from commit 3b57513b3f39c04337801fb9d159c7ca8dfa9deb)
Mickaël Raulet [Sun, 27 Oct 2013 14:26:58 +0000 (15:26 +0100)]
hevc: cosmetic change(cherry picked from commit 3b57513b3f39c04337801fb9d159c7ca8dfa9deb)

Decreases the difference to Anton Khirnovs patch v5

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agohevc: more cosmetic(cherry picked from commit 9697abe41daa234602915f85bf6b1c0ca0252cff)
Mickaël Raulet [Sun, 27 Oct 2013 12:29:50 +0000 (13:29 +0100)]
hevc: more cosmetic(cherry picked from commit 9697abe41daa234602915f85bf6b1c0ca0252cff)

Decreases the difference to Anton Khirnovs patch v5

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agohevc : cosmetic changes(cherry picked from commit 7308c0ccf13f18cebe4851e6dcd6b5c0b09...
Mickaël Raulet [Sun, 27 Oct 2013 11:56:48 +0000 (12:56 +0100)]
hevc : cosmetic changes(cherry picked from commit 7308c0ccf13f18cebe4851e6dcd6b5c0b09be1dd)

Decreases the difference to Anton Khirnovs patch v5

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agolavc: add support for CODEC_CAP_DELAY in subtitles
Marton Balint [Wed, 23 Oct 2013 18:55:24 +0000 (20:55 +0200)]
lavc: add support for CODEC_CAP_DELAY in subtitles

This patch adds CODEC_CAP_DELAY support to avcodec_decode_subtitle2.

For DVB teletext decoding, a single teletext packet can contain multiple
teletext pages. In order to support that, the teletext decoder may buffer
some pages.

Signed-off-by: Marton Balint <cus@passwd.hu>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agolavd/fbdev_enc: remove unused variables
Lukasz Marek [Sun, 27 Oct 2013 21:35:54 +0000 (22:35 +0100)]
lavd/fbdev_enc: remove unused variables

Signed-off-by: Lukasz Marek <lukasz.m.luki@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoavcodec/hevc: calculate checksum only if AV_EF_EXPLODE is set
Michael Niedermayer [Sun, 27 Oct 2013 21:22:23 +0000 (22:22 +0100)]
avcodec/hevc: calculate checksum only if AV_EF_EXPLODE is set

This avoids a slowdown with the default of enabled CRC checks

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoRevert "avcodec/options_table: disable CRC checking by default"
Michael Niedermayer [Sun, 27 Oct 2013 21:21:09 +0000 (22:21 +0100)]
Revert "avcodec/options_table: disable CRC checking by default"

This reverts commit c7027ce9eac04fb20bd85fa37dbf24856c080c45.

It appears there is no complete consensus on this currently.

6 years agoRevert "avcodec/options_table: set err_detect to careful by default"
Michael Niedermayer [Sun, 27 Oct 2013 21:20:39 +0000 (22:20 +0100)]
Revert "avcodec/options_table: set err_detect to careful by default"

This reverts commit b1348eb68b432041b2557b9073590cf0fa60ff14.

6 years agolavd/fbdev_enc: more stream validation restrictive
Lukasz Marek [Sun, 27 Oct 2013 20:41:27 +0000 (21:41 +0100)]
lavd/fbdev_enc: more stream validation restrictive

So far fbdev_enc device picked up first video stream and ignored others.
It is required to provide exactly one video stream now.

Signed-off-by: Lukasz Marek <lukasz.m.luki@gmail.com>
6 years agolavd/pulse_audio_enc: more stream validation restrictive
Lukasz Marek [Sun, 27 Oct 2013 20:27:39 +0000 (21:27 +0100)]
lavd/pulse_audio_enc: more stream validation restrictive

So far pulse device picked up first audio stream and ignored others.
It is required to provide exactly one audio stream now.

Signed-off-by: Lukasz Marek <lukasz.m.luki@gmail.com>
6 years agolavd:pulse_audio_enc: fix array compared against 0
Lukasz Marek [Sun, 27 Oct 2013 20:18:27 +0000 (21:18 +0100)]
lavd:pulse_audio_enc: fix array compared against 0

fixes CID 1113222

Signed-off-by: Lukasz Marek <lukasz.m.luki@gmail.com>
6 years agolavd/pulse_audio_enc: fix timestamp calculation
Lukasz Marek [Thu, 24 Oct 2013 13:11:19 +0000 (15:11 +0200)]
lavd/pulse_audio_enc: fix timestamp calculation

Current implementation didn't include duration of
last processed packet.
Also remove access to st->cur_dts and replace with pkt->pts.

Signed-off-by: Lukasz Marek <lukasz.m.luki@gmail.com>
6 years agoAVOptions: do not range check flag options.
Anton Khirnov [Sat, 26 Oct 2013 08:34:01 +0000 (10:34 +0200)]
AVOptions: do not range check flag options.

It does not make sense in the vast majority of use cases, no currently
defined AV_OPT_TYPE_FLAGS options in Libav set the range to anything
nontrivial, and many of those get it wrong (the "correct" range is
INT_MIN to INT_MAX so that the builtin constant "all" works).

6 years agoh264_ps: when parsing a VUI fails, only abort when explode is set
Anton Khirnov [Sat, 26 Oct 2013 08:22:31 +0000 (10:22 +0200)]
h264_ps: when parsing a VUI fails, only abort when explode is set

A VUI doesn't contain anything strictly necessary for decoding.
Apparently there are many samples with truncated VUIs in the wild, this
commit should allow decoding them.

6 years agoFATE: add bitexact sws flags to the fieldorder test
Paul B Mahol [Sat, 26 Oct 2013 16:21:29 +0000 (18:21 +0200)]
FATE: add bitexact sws flags to the fieldorder test

swscale is called for the 420 to 422 conversion

Signed-off-by: Anton Khirnov <anton@khirnov.net>
6 years agoavconv: drop a now useless variable
Anton Khirnov [Sun, 27 Oct 2013 07:42:05 +0000 (08:42 +0100)]
avconv: drop a now useless variable

6 years agoavframe: mark source frame const in _ref and _clone
Vittorio Giovara [Sat, 26 Oct 2013 14:43:07 +0000 (16:43 +0200)]
avframe: mark source frame const in _ref and _clone

Signed-off-by: Anton Khirnov <anton@khirnov.net>
6 years agommvideo: fix uninitialized variable use in mm_decode_intra
Vittorio Giovara [Sat, 26 Oct 2013 23:54:47 +0000 (01:54 +0200)]
mmvideo: fix uninitialized variable use in mm_decode_intra

Signed-off-by: Anton Khirnov <anton@khirnov.net>
6 years agolibavfilter/vf_noise: relicense to LGPL
Paul B Mahol [Sat, 26 Oct 2013 19:47:28 +0000 (19:47 +0000)]
libavfilter/vf_noise: relicense to LGPL

Signed-off-by: Paul B Mahol <onemda@gmail.com>
6 years agoavcodec/options_table: set err_detect to careful by default
Michael Niedermayer [Sun, 27 Oct 2013 08:17:47 +0000 (09:17 +0100)]
avcodec/options_table: set err_detect to careful by default

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoavcodec/options_table: disable CRC checking by default
Anton Khirnov [Fri, 25 Oct 2013 14:41:48 +0000 (16:41 +0200)]
avcodec/options_table: disable CRC checking by default

3 runs each of fate-suite/hevc-conformance/ENTP_C_LG_3.bit

with crc flag
1841819858 decicycles in frame decode, 32 runs, 0 skips
1833937180 decicycles in frame decode, 32 runs, 0 skips
1843283884 decicycles in frame decode, 32 runs, 0 skips

without crc flag
1703897301 decicycles in frame decode, 32 runs, 0 skips
1695031879 decicycles in frame decode, 32 runs, 0 skips
1697524383 decicycles in frame decode, 32 runs, 0 skips

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoavcodec/takdec: also do crc check when er compliant is set
Michael Niedermayer [Sun, 27 Oct 2013 08:28:30 +0000 (09:28 +0100)]
avcodec/takdec: also do crc check when er compliant is set

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoavio: Check for memory allocation failure of private data
Derek Buitenhuis [Tue, 22 Oct 2013 19:22:13 +0000 (20:22 +0100)]
avio: Check for memory allocation failure of private data

Signed-off-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
6 years agoavfiltergraph: Properly handle memory allocation failure
Derek Buitenhuis [Tue, 22 Oct 2013 18:40:05 +0000 (19:40 +0100)]
avfiltergraph: Properly handle memory allocation failure

Signed-off-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
6 years agotimefilter: Handle memory allocation failure
Derek Buitenhuis [Tue, 22 Oct 2013 17:46:37 +0000 (18:46 +0100)]
timefilter: Handle memory allocation failure

Signed-off-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
6 years agolavr: check that current_buffer is not NULL before using it
Justin Ruggles [Sun, 27 Oct 2013 19:00:36 +0000 (15:00 -0400)]
lavr: check that current_buffer is not NULL before using it

Fixes a segfault during resampling when compiled with -DDEBUG.
Fixes all fate-lavr-resample tests with -DDEBUG.

CC:libav-stable@libav.org

6 years agoavcodec/avcodec.h: Add documentation for the AV_EF_* defifines
Michael Niedermayer [Sun, 27 Oct 2013 18:31:40 +0000 (19:31 +0100)]
avcodec/avcodec.h: Add documentation for the AV_EF_* defifines

The documentation is copied from the AVOption texts

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agocorrect the AVOption documentation for AV_EF_CAREFUL
Michael Niedermayer [Sun, 27 Oct 2013 18:28:31 +0000 (19:28 +0100)]
correct the AVOption documentation for AV_EF_CAREFUL

The flag was and is intended to be a sane default and thus does not enable
time consuming checks. This also matches how the flag is used in decoders and
demuxers.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoavfilter: add mergeplanes filter
Paul B Mahol [Fri, 27 Sep 2013 18:37:51 +0000 (18:37 +0000)]
avfilter: add mergeplanes filter

Signed-off-by: Paul B Mahol <onemda@gmail.com>
6 years agoffmpeg_filter: Fix non jpeg yuv in jpeg support
Michael Niedermayer [Wed, 2 Oct 2013 12:16:12 +0000 (14:16 +0200)]
ffmpeg_filter: Fix non jpeg yuv in jpeg support

This is a regression, did not bisect so dont know what caused it but
likely some changes to the command line handling code.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoavformat/utils: make "first_dts not matching first dts in the queue" message more...
Michael Niedermayer [Sat, 28 Sep 2013 02:06:13 +0000 (04:06 +0200)]
avformat/utils: make "first_dts not matching first dts in the queue" message more informative

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agodoc/encoders: replace @xref with @ref command
Stefano Sabatini [Sun, 27 Oct 2013 14:31:38 +0000 (15:31 +0100)]
doc/encoders: replace @xref with @ref command

@xref is ignored by texi2pod.

6 years agovp9: skip itxfm_add if the whole block has no coefficients.
Ronald S. Bultje [Sun, 27 Oct 2013 13:13:11 +0000 (09:13 -0400)]
vp9: skip itxfm_add if the whole block has no coefficients.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoavcodec/x86/videodsp: Small speedups in ff_emulated_edge_mc x86 SIMD.
Ronald S. Bultje [Sat, 26 Oct 2013 12:24:09 +0000 (08:24 -0400)]
avcodec/x86/videodsp: Small speedups in ff_emulated_edge_mc x86 SIMD.

Don't use word-size multiplications if size == 2, and if we're using
SIMD instructions (size >= 8), complete leftover 4byte sets using movd,
not mov. Both of these changes lead to minor speedups.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoavcodec/x86/videodsp: fix a bug in a %if statement where we used '%%' instead of...
Ronald S. Bultje [Sat, 26 Oct 2013 12:24:09 +0000 (08:24 -0400)]
avcodec/x86/videodsp: fix a bug in a %if statement where we used '%%' instead of '&&'.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agolavfi/overlay: correct small error in intersection detection
Benedict Endemann [Sat, 26 Oct 2013 13:22:44 +0000 (15:22 +0200)]
lavfi/overlay: correct small error in intersection detection

The image size of the destination image was used to determine if a source
image was positioned outside the destination image, that no intersection
could occur.  Actually for these two cases the size of the source image
has to be used!

Signed-off-by: Stefano Sabatini <stefasab@gmail.com>
6 years agovcodec/vc1dec: remove dead code
Michael Niedermayer [Sun, 27 Oct 2013 12:34:35 +0000 (13:34 +0100)]
vcodec/vc1dec: remove dead code

Fixes CID732196

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoavcodec/vc1_parser: check ff_vc1_parse_frame_header*() return value
Michael Niedermayer [Sun, 27 Oct 2013 12:28:08 +0000 (13:28 +0100)]
avcodec/vc1_parser: check ff_vc1_parse_frame_header*() return value

Fixed CID739860

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoavcodec/tiff: factorize offset init code
Michael Niedermayer [Sun, 27 Oct 2013 12:10:06 +0000 (13:10 +0100)]
avcodec/tiff: factorize offset init code

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoavcodec/tiff: remove TIFF_LONG special case
Michael Niedermayer [Sun, 27 Oct 2013 12:07:44 +0000 (13:07 +0100)]
avcodec/tiff: remove TIFF_LONG special case

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoavcodec/tiff: Fix use of uninitialized off variable
Michael Niedermayer [Sun, 27 Oct 2013 11:43:59 +0000 (12:43 +0100)]
avcodec/tiff: Fix use of uninitialized off variable

Fixes CID1108608

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agodoc/encoders: add libshine doc
Timothy Gu [Sun, 27 Oct 2013 03:26:34 +0000 (20:26 -0700)]
doc/encoders: add libshine doc

Signed-off-by: Timothy Gu <timothygu99@gmail.com>
Signed-off-by: Stefano Sabatini <stefasab@gmail.com>
6 years agodoc/protocols/rtp: apply misc fixes
Stefano Sabatini [Sun, 27 Oct 2013 11:39:21 +0000 (12:39 +0100)]
doc/protocols/rtp: apply misc fixes

Partially suggested-by Burek Pekaric <burek021@gmail.com>.

6 years agoMAINTAINERS: add my name for Launchpad
Timothy Gu [Sun, 27 Oct 2013 03:26:15 +0000 (20:26 -0700)]
MAINTAINERS: add my name for Launchpad

Signed-off-by: Timothy Gu <timothygu99@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoavcodec/hevcpred_template: Fix integer overflows
Michael Niedermayer [Sun, 27 Oct 2013 10:50:24 +0000 (11:50 +0100)]
avcodec/hevcpred_template: Fix integer overflows

signed integer overflow is undefined in C

Fixes the following gcc warnings:
In file included from libavcodec/hevcpred.c:27:0:
libavcodec/hevcpred_template.c: In function ‘intra_pred_8’:
libavcodec/hevcpred_template.c:302:9: warning: assuming signed overflow does not occur when assuming that (X - c) > X is always false [-Wstrict-overflow]
In file included from libavcodec/hevcpred.c:31:0:
libavcodec/hevcpred_template.c: In function ‘intra_pred_9’:
libavcodec/hevcpred_template.c:302:9: warning: assuming signed overflow does not occur when assuming that (X - c) > X is always false [-Wstrict-overflow]
In file included from libavcodec/hevcpred.c:35:0:
libavcodec/hevcpred_template.c: In function ‘intra_pred_10’:
libavcodec/hevcpred_template.c:302:9: warning: assuming signed overflow does not occur when assuming that (X - c) > X is always false [-Wstrict-overflow]

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>