ffmpeg.git
4 years agoMerge commit 'bacc92b59bfa5d6a1f631e63e46fc1d2fb934e51'
Michael Niedermayer [Wed, 11 Mar 2015 19:28:36 +0000 (20:28 +0100)]
Merge commit 'bacc92b59bfa5d6a1f631e63e46fc1d2fb934e51'

* commit 'bacc92b59bfa5d6a1f631e63e46fc1d2fb934e51':
  rtpdec_vp9: Drop extra sanity check for size of input packet

Merged-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoMerge commit 'fe99c52fa99e44961a09cd1324aefd492b797fc8'
Michael Niedermayer [Wed, 11 Mar 2015 19:17:40 +0000 (20:17 +0100)]
Merge commit 'fe99c52fa99e44961a09cd1324aefd492b797fc8'

* commit 'fe99c52fa99e44961a09cd1324aefd492b797fc8':
  mp3: Properly use AVCodecContext API

Conflicts:
libavformat/mp3dec.c

See: 6ad42b3e15478284321dd285acaf189a16590854
See: b851bc20c6931c084710e69f7eec30d8c1bdb68e
Merged-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoMerge commit '9272c965d9559a90ee64d46aebd99c117e07f7a3'
Michael Niedermayer [Wed, 11 Mar 2015 19:09:18 +0000 (20:09 +0100)]
Merge commit '9272c965d9559a90ee64d46aebd99c117e07f7a3'

* commit '9272c965d9559a90ee64d46aebd99c117e07f7a3':
  matroskaenc: Fix type used for chapter timestamps

Conflicts:
libavformat/matroskaenc.c

See: a4cd057bc7ddd2dd094d2ae7b0d6843ade95a626
Merged-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoMerge commit 'dc2d0e06af459af9a7f91b65e0a3119acc4f1baa'
Michael Niedermayer [Wed, 11 Mar 2015 18:58:43 +0000 (19:58 +0100)]
Merge commit 'dc2d0e06af459af9a7f91b65e0a3119acc4f1baa'

* commit 'dc2d0e06af459af9a7f91b65e0a3119acc4f1baa':
  mlpdec: support TrueHD streams with an Atmos substream

See: 36bf549b2706bd10014556a84a33ed6daf5d5373
Merged-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoMerge commit 'f36f6a608b5b2c17f8876195c61621c8f8607cee'
Michael Niedermayer [Wed, 11 Mar 2015 18:50:08 +0000 (19:50 +0100)]
Merge commit 'f36f6a608b5b2c17f8876195c61621c8f8607cee'

* commit 'f36f6a608b5b2c17f8876195c61621c8f8607cee':
  mlpdec: support major sync headers with optional extension blocks

See: ff34b2d6d35b212523428b9b932cce4914f7ac03
Merged-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoavcodec/mpegvideo_motion: Fix undefined shifts in mpeg_motion_internal()
Michael Niedermayer [Wed, 11 Mar 2015 18:03:16 +0000 (19:03 +0100)]
avcodec/mpegvideo_motion: Fix undefined shifts in mpeg_motion_internal()

Found-by: Clang -fsanitize=shift
Reported-by: Thierry Foucu <tfoucu@google.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 years agortpdec_vp9: Drop extra sanity check for size of input packet
Vittorio Giovara [Mon, 9 Mar 2015 17:27:22 +0000 (17:27 +0000)]
rtpdec_vp9: Drop extra sanity check for size of input packet

In this case len is always at least 1, since it is checked against
RTP_VP9_DESC_REQUIRED_SIZE + 1 and then it is reduced by
RTP_VP9_DESC_REQUIRED_SIZE before entering the has_pic_id check.

Bug-Id: CID 1270811

4 years agomp3: Properly use AVCodecContext API
Vittorio Giovara [Mon, 9 Mar 2015 23:02:00 +0000 (23:02 +0000)]
mp3: Properly use AVCodecContext API

Rather than having an unitialized context on the stack, allocate it with
defaults and free it when unneeded.

CC: libav-stable@libav.org
4 years agoavcodec/h264dsp_template: Fix undefined shift in biweight_h264_pixels and weight_h264...
Michael Niedermayer [Wed, 11 Mar 2015 17:49:57 +0000 (18:49 +0100)]
avcodec/h264dsp_template: Fix undefined shift in biweight_h264_pixels and weight_h264_pixels

Found-by: Clang -fsanitize=shift
Reported-by: Thierry Foucu <tfoucu@google.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 years agomatroskaenc: Fix type used for chapter timestamps
Vittorio Giovara [Wed, 11 Mar 2015 14:56:52 +0000 (14:56 +0000)]
matroskaenc: Fix type used for chapter timestamps

4 years agoavcodec/mpegvideo: Fix undefined shift in ff_mpv_lowest_referenced_row()
Michael Niedermayer [Wed, 11 Mar 2015 16:59:59 +0000 (17:59 +0100)]
avcodec/mpegvideo: Fix undefined shift in ff_mpv_lowest_referenced_row()

Also moves the shift out of the inner loop

Found-by: Clang -fsanitize=shift
Reported-by: Thierry Foucu <tfoucu@google.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoavcodec/vp8: Fix undefined shifts in vp8_mc_luma()
Michael Niedermayer [Wed, 11 Mar 2015 15:55:07 +0000 (16:55 +0100)]
avcodec/vp8: Fix undefined shifts in vp8_mc_luma()

Found-by: Clang -fsanitize=shift
Reported-by: Thierry Foucu <tfoucu@google.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoavcodec/golomb: Fix undefined shifts in unsigned rice decoding code
Michael Niedermayer [Wed, 11 Mar 2015 15:47:13 +0000 (16:47 +0100)]
avcodec/golomb: Fix undefined shifts in unsigned rice decoding code

Found-by: Clang -fsanitize=shift
Reported-by: Thierry Foucu <tfoucu@google.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoavcodec/amrnbde: Fix undefined shift in decode_pitch_vector()
Michael Niedermayer [Wed, 11 Mar 2015 15:28:06 +0000 (16:28 +0100)]
avcodec/amrnbde: Fix undefined shift in decode_pitch_vector()

This also simplifies the code

Found-by: Clang -fsanitize=shift
Reported-by: Thierry Foucu <tfoucu@google.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 years agomlpdec: support TrueHD streams with an Atmos substream
Hendrik Leppkes [Fri, 26 Sep 2014 11:49:21 +0000 (13:49 +0200)]
mlpdec: support TrueHD streams with an Atmos substream

The fourth substream is being discarded, since its not raw audio data,
but an encoded Atmos stream which needs a specialized decoder.

Fixes decoding of the true hd stream from Transformers\ -\ Age\ of\ Extinction\ 2014\ 1080P-003.mkv

Signed-off-by: Anton Khirnov <anton@khirnov.net>
4 years agomlpdec: support major sync headers with optional extension blocks
Hendrik Leppkes [Fri, 26 Sep 2014 11:49:20 +0000 (13:49 +0200)]
mlpdec: support major sync headers with optional extension blocks

Signed-off-by: Anton Khirnov <anton@khirnov.net>
4 years agoswscale/utils: Fix undefined shift in initFilter()
Michael Niedermayer [Wed, 11 Mar 2015 14:40:28 +0000 (15:40 +0100)]
swscale/utils: Fix undefined shift in initFilter()

Found-by: Clang -fsanitize=shift
Reported-by: Thierry Foucu <tfoucu@google.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoavcodec/wma: Fix undefined shift in ff_wma_run_level_decode()
Michael Niedermayer [Wed, 11 Mar 2015 12:32:08 +0000 (13:32 +0100)]
avcodec/wma: Fix undefined shift in ff_wma_run_level_decode()

Found-by: Clang -fsanitize=shift
Reported-by: Thierry Foucu <tfoucu@google.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoavcodec/vc1_pred: Fix undefined shift in ff_vc1_pred_mv()
Michael Niedermayer [Wed, 11 Mar 2015 12:16:47 +0000 (13:16 +0100)]
avcodec/vc1_pred: Fix undefined shift in ff_vc1_pred_mv()

Found-by: Clang -fsanitize=shift
Reported-by: Thierry Foucu <tfoucu@google.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoavcodec/mpeg12dec: Fix undefined shift
Michael Niedermayer [Wed, 11 Mar 2015 03:24:57 +0000 (04:24 +0100)]
avcodec/mpeg12dec: Fix undefined shift

Found-by: Clang -fsanitize=shift
Reported-by: Thierry Foucu <tfoucu@google.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 years agox86: Makefile: fix DBG parameter evaluation
Christophe Gisquet [Sun, 8 Mar 2015 16:54:25 +0000 (17:54 +0100)]
x86: Makefile: fix DBG parameter evaluation

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 years agolavf/libssh: support reading config from ~/.ssh/config
Florian Jacob [Wed, 11 Mar 2015 00:13:44 +0000 (01:13 +0100)]
lavf/libssh: support reading config from ~/.ssh/config

libssh provides a function for parsing ~/.ssh/config for ssh connection parameters like user, hostname, identity file
and port. This patch makes ffmpeg use this function to take parameters from the config file for everything that's not
explicitely set in the url. It also supports host aliases, i.e. using a shorthand in the url and replacing it with the
hostname / IP address specified for the shorthand in the config file.

Signed-off-by: Florian Jacob <projects+ffmpeg@florianjacob.de>
Signed-off-by: Lukasz Marek <lukasz.m.luki2@gmail.com>
4 years agoavcodec/012v: redesign main loop
Michael Niedermayer [Tue, 10 Mar 2015 18:18:34 +0000 (19:18 +0100)]
avcodec/012v: redesign main loop

Fixes out of array accesses
Fixes: ffmpeg_012v_crash.ts

Found-by: Thomas Lindroth <thomas.lindroth@gmail.com>
Reviewed-by: Thomas Lindroth <thomas.lindroth@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 years agolavfi/boxblur: Fix colourpsace list.
Carl Eugen Hoyos [Tue, 10 Mar 2015 21:55:30 +0000 (22:55 +0100)]
lavfi/boxblur: Fix colourpsace list.

Fixes ticket #4363.

4 years agoavcodec/h264: Fix undefined shifts in pack16to32() and pack8to16()
Michael Niedermayer [Tue, 10 Mar 2015 20:15:05 +0000 (21:15 +0100)]
avcodec/h264: Fix undefined shifts in pack16to32() and pack8to16()

Reported-by: Thierry Foucu <tfoucu@google.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoavcodec/mpegvideo: Fix undefined shifts in ff_init_block_index()
Michael Niedermayer [Tue, 10 Mar 2015 20:15:05 +0000 (21:15 +0100)]
avcodec/mpegvideo: Fix undefined shifts in ff_init_block_index()

Reported-by: Thierry Foucu <tfoucu@google.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoavcodec/012v: Check dimensions more completely
Michael Niedermayer [Tue, 10 Mar 2015 19:21:14 +0000 (20:21 +0100)]
avcodec/012v: Check dimensions more completely

Fixes division by 0

Found-by: Thomas Lindroth <thomas.lindroth@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoavfilter/aeval: Fixed a memory leak in EvalContext::channel_values
Ole Andre Birkedal [Tue, 10 Mar 2015 13:12:30 +0000 (14:12 +0100)]
avfilter/aeval: Fixed a memory leak in EvalContext::channel_values

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoForce -D__EXTENSIONS__ on Solaris.
Carl Eugen Hoyos [Tue, 10 Mar 2015 12:36:49 +0000 (13:36 +0100)]
Force -D__EXTENSIONS__ on Solaris.

This fixes compilation of libavformat/udp.o on some installations,
regression since 3a5cbc91
Reported by Cristian Dustinta for SunOS 5.10

4 years agolavc/hevcdsp: Fix compilation for arm with --disable-neon.
Carl Eugen Hoyos [Tue, 10 Mar 2015 11:14:16 +0000 (12:14 +0100)]
lavc/hevcdsp: Fix compilation for arm with --disable-neon.

4 years agolavd/avfoundation: Silence warnings when compiling for iOS.
Carl Eugen Hoyos [Tue, 10 Mar 2015 11:08:29 +0000 (12:08 +0100)]
lavd/avfoundation: Silence warnings when compiling for iOS.

Reviewed-by: Thilo Borgmann
4 years agolavd/avfoundation: Silence c99 warnings when using gcc.
Carl Eugen Hoyos [Tue, 10 Mar 2015 11:08:02 +0000 (12:08 +0100)]
lavd/avfoundation: Silence c99 warnings when using gcc.

Reviewed-by: Thilo Borgmann
4 years agolavd/qtkit: Silence deprecation warnings when using clang.
Carl Eugen Hoyos [Tue, 10 Mar 2015 11:04:35 +0000 (12:04 +0100)]
lavd/qtkit: Silence deprecation warnings when using clang.

Reviewed-by: Thilo Borgmann
4 years agoMerge commit '448c8cfe4c53e9e806effd8505b46d57fa707061'
Michael Niedermayer [Tue, 10 Mar 2015 10:42:44 +0000 (11:42 +0100)]
Merge commit '448c8cfe4c53e9e806effd8505b46d57fa707061'

* commit '448c8cfe4c53e9e806effd8505b46d57fa707061':
  movenc: Support setting fragment_index before the moov atom is written

Conflicts:
libavformat/movenc.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoMerge commit '0c5e380c2c266d2e8a13c000cc527529db837f10'
Michael Niedermayer [Tue, 10 Mar 2015 10:27:03 +0000 (11:27 +0100)]
Merge commit '0c5e380c2c266d2e8a13c000cc527529db837f10'

* commit '0c5e380c2c266d2e8a13c000cc527529db837f10':
  movenc: Don't rely on the fragment index for vc1 info gathering

Merged-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoMerge commit 'cf402d6fa88acd647cdff993429583bec8a34fdc'
Michael Niedermayer [Tue, 10 Mar 2015 10:17:28 +0000 (11:17 +0100)]
Merge commit 'cf402d6fa88acd647cdff993429583bec8a34fdc'

* commit 'cf402d6fa88acd647cdff993429583bec8a34fdc':
  rtpenc_mpegts: Set chain->rtp_ctx only after avformat_write_header succeeded

Reviewed-by: Andreas Cadhalpun <andreas.cadhalpun@googlemail.com>
Merged-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoMerge commit 'c83dd2d2a458075a58895c384372f57c1ec26276'
Michael Niedermayer [Tue, 10 Mar 2015 10:08:30 +0000 (11:08 +0100)]
Merge commit 'c83dd2d2a458075a58895c384372f57c1ec26276'

* commit 'c83dd2d2a458075a58895c384372f57c1ec26276':
  rtpenc_mpegts: Free the right ->pb in the error path in the init function

Reviewed-by: Andreas Cadhalpun <andreas.cadhalpun@googlemail.com>
Merged-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoMerge commit '96a06dbaf278e8152487e08772946f63bd2a3843'
Michael Niedermayer [Tue, 10 Mar 2015 09:58:44 +0000 (10:58 +0100)]
Merge commit '96a06dbaf278e8152487e08772946f63bd2a3843'

* commit '96a06dbaf278e8152487e08772946f63bd2a3843':
  FATE: add support for testing hwaccels

Conflicts:
tests/Makefile
tests/fate-run.sh

Merged-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoMerge commit 'dc7536ca3d2dbe47f40cc0fcd0fc2555a84d5f56'
Michael Niedermayer [Tue, 10 Mar 2015 09:48:46 +0000 (10:48 +0100)]
Merge commit 'dc7536ca3d2dbe47f40cc0fcd0fc2555a84d5f56'

* commit 'dc7536ca3d2dbe47f40cc0fcd0fc2555a84d5f56':
  avconv: do not abort immediately if initializing hwaccel fails

Merged-by: Michael Niedermayer <michaelni@gmx.at>
4 years agomovenc: Support setting fragment_index before the moov atom is written
Martin Storsjö [Tue, 20 Jan 2015 14:33:12 +0000 (15:33 +0100)]
movenc: Support setting fragment_index before the moov atom is written

This way, the caller doesn't need to coordinate setting the option
after the moov atom has been written. The downside is that it is
no longer possible to use the option for checking whether the moov
atom already has been written, but a caller is able to keep track
of that by other means anyway.

Signed-off-by: Martin Storsjö <martin@martin.st>
4 years agomovenc: Don't rely on the fragment index for vc1 info gathering
Martin Storsjö [Tue, 20 Jan 2015 14:54:03 +0000 (15:54 +0100)]
movenc: Don't rely on the fragment index for vc1 info gathering

The previous use of the mov->fragments field, for determining whether
written packets were part of the first fragment or not, didn't
work as intended when using the empty_moov flag.

Signed-off-by: Martin Storsjö <martin@martin.st>
4 years agortpenc_mpegts: Set chain->rtp_ctx only after avformat_write_header succeeded
Martin Storsjö [Mon, 9 Mar 2015 21:14:19 +0000 (23:14 +0200)]
rtpenc_mpegts: Set chain->rtp_ctx only after avformat_write_header succeeded

By making sure we at each time only have one pointer set, either a
local variable or one in the context, we avoid potential double frees
in the cleanup routines. If chain->rtp_ctx is set, it is closed by
calling avformat_write_trailer, but that shouldn't be called unless
avformat_write_header succeeded.

This issue was pointed out by Andreas Cadhalpun.

Signed-off-by: Martin Storsjö <martin@martin.st>
4 years agortpenc_mpegts: Free the right ->pb in the error path in the init function
Martin Storsjö [Mon, 9 Mar 2015 21:09:10 +0000 (23:09 +0200)]
rtpenc_mpegts: Free the right ->pb in the error path in the init function

This fixes a typo from 8e32b1f096.

Signed-off-by: Martin Storsjö <martin@martin.st>
4 years agoFATE: add support for testing hwaccels
Anton Khirnov [Mon, 9 Mar 2015 09:56:54 +0000 (10:56 +0100)]
FATE: add support for testing hwaccels

4 years agoavconv: do not abort immediately if initializing hwaccel fails
Anton Khirnov [Mon, 9 Mar 2015 09:54:00 +0000 (10:54 +0100)]
avconv: do not abort immediately if initializing hwaccel fails

exit_program() will try to free the decoders, which is not a good idea
from within get_format().
Return an error instead.

4 years agoavfilter/vf_fftfilt: increase RDFT length by 10%
Michael Niedermayer [Tue, 10 Mar 2015 02:32:38 +0000 (03:32 +0100)]
avfilter/vf_fftfilt: increase RDFT length by 10%

This fixes artifacts when the dimensions are exact powers of 2

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 years agolibavformat/mxfenc: write package name metadata
Mark Reid [Thu, 5 Mar 2015 18:59:11 +0000 (10:59 -0800)]
libavformat/mxfenc: write package name metadata

Previous-version-reviewed-by: Tomas Härdin <tomas.hardin@codemill.se>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoasfenc: fix leaking asf->index_ptr on error
Andreas Cadhalpun [Mon, 9 Mar 2015 18:31:39 +0000 (19:31 +0100)]
asfenc: fix leaking asf->index_ptr on error

Signed-off-by: Andreas Cadhalpun <Andreas.Cadhalpun@googlemail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoroqvideoenc: set enc->avctx in roq_encode_init
Andreas Cadhalpun [Mon, 9 Mar 2015 18:24:09 +0000 (19:24 +0100)]
roqvideoenc: set enc->avctx in roq_encode_init

So far it is only set in roq_encode_frame, but it is used in
roq_encode_end to free the coded_frame. This currently segfaults if
roq_encode_frame is not called between roq_encode_init and
roq_encode_end.

Signed-off-by: Andreas Cadhalpun <Andreas.Cadhalpun@googlemail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoavcodec/libvpxenc: Clear twopass_stats.sz on deallocation
Michael Niedermayer [Mon, 9 Mar 2015 20:17:45 +0000 (21:17 +0100)]
avcodec/libvpxenc: Clear twopass_stats.sz on deallocation

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoMerge commit '93f7948136fcda8ddbbc44a6c24418f11ca829b8'
Michael Niedermayer [Mon, 9 Mar 2015 20:15:50 +0000 (21:15 +0100)]
Merge commit '93f7948136fcda8ddbbc44a6c24418f11ca829b8'

* commit '93f7948136fcda8ddbbc44a6c24418f11ca829b8':
  libvpx: Fix mixed use of av_malloc() and av_reallocp()

Merged-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoavformat/siff: Fix checks and variable types
Michael Niedermayer [Mon, 9 Mar 2015 20:05:29 +0000 (21:05 +0100)]
avformat/siff: Fix checks and variable types

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoMerge commit 'ad94c6ca0b86c463f476b26606259a2041dcddc9'
Michael Niedermayer [Mon, 9 Mar 2015 20:00:33 +0000 (21:00 +0100)]
Merge commit 'ad94c6ca0b86c463f476b26606259a2041dcddc9'

* commit 'ad94c6ca0b86c463f476b26606259a2041dcddc9':
  siff: Use the correct type for packet size variables

Conflicts:
libavformat/siff.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoMerge commit '9f25a109922da43c1f81273a431d3b40cb5a785a'
Michael Niedermayer [Mon, 9 Mar 2015 19:16:07 +0000 (20:16 +0100)]
Merge commit '9f25a109922da43c1f81273a431d3b40cb5a785a'

* commit '9f25a109922da43c1f81273a431d3b40cb5a785a':
  matroskaenc: Also validate chapter end time

Merged-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoMerge commit 'bfeb83a8b7d3fcf09a54d8dbc9c521e10bb17530'
Michael Niedermayer [Mon, 9 Mar 2015 19:00:06 +0000 (20:00 +0100)]
Merge commit 'bfeb83a8b7d3fcf09a54d8dbc9c521e10bb17530'

* commit 'bfeb83a8b7d3fcf09a54d8dbc9c521e10bb17530':
  rtpdec_hevc: Drop extra sanity check for size of input packet

Merged-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoavcodec/hevc_parser: use avpriv_find_start_code in hevc_split()
zhaoxiu.zeng [Mon, 9 Mar 2015 16:57:57 +0000 (00:57 +0800)]
avcodec/hevc_parser: use avpriv_find_start_code in hevc_split()

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoavcodec/options_table: remove extradata_size from the AVOptions table
Michael Niedermayer [Mon, 9 Mar 2015 02:42:00 +0000 (03:42 +0100)]
avcodec/options_table: remove extradata_size from the AVOptions table

allowing access to the size but not the extradata itself is not useful
and could lead to potential problems if writing happens through this field

Reviewed-by: Andreas Cadhalpun <andreas.cadhalpun@googlemail.com>
Reviewed-by: Lukasz Marek <lukasz.m.luki2@gmail.com>
Reviewed-by: Nicolas George <george@nsup.org>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 years agotests/fate-run: Print more details on failure of stddev / filesize compares
Claudio Freire [Sun, 8 Mar 2015 06:53:22 +0000 (03:53 -0300)]
tests/fate-run: Print more details on failure of stddev / filesize compares

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoffmdec: limit the backward seek to the last resync position
Andreas Cadhalpun [Mon, 9 Mar 2015 13:59:44 +0000 (14:59 +0100)]
ffmdec: limit the backward seek to the last resync position

If resyncing leads to the same position as previously, it will again
lead to a resync attempt, resulting in an infinite loop.

Thus don't seek back beyond the last syncpoint.

Signed-off-by: Andreas Cadhalpun <Andreas.Cadhalpun@googlemail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoAdd dependencies to configure file for vf_fftfilt
Arwa Arif [Mon, 9 Mar 2015 03:35:35 +0000 (09:05 +0530)]
Add dependencies to configure file for vf_fftfilt

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 years agolibvpx: Fix mixed use of av_malloc() and av_reallocp()
Vittorio Giovara [Sun, 8 Mar 2015 21:08:16 +0000 (21:08 +0000)]
libvpx: Fix mixed use of av_malloc() and av_reallocp()

This buffer is resized when vpx_codec_get_cx_data() returns a
VPX_CODEC_STATS_PKT packet.

CC: libav-stable@libav.org
Signed-off-by: Vittorio Giovara <vittorio.giovara@gmail.com>
4 years agosiff: Use the correct type for packet size variables
Vittorio Giovara [Sun, 8 Mar 2015 23:59:58 +0000 (23:59 +0000)]
siff: Use the correct type for packet size variables

The avio functions used here return an unsigned value.
Also reduce a variable scope.

CC: libav-stable@libav.org
Bug-Id: CID 1258461

4 years agomatroskaenc: Also validate chapter end time
Vittorio Giovara [Mon, 9 Mar 2015 00:05:30 +0000 (00:05 +0000)]
matroskaenc: Also validate chapter end time

This prevents it to be written as unsigned. Also add an error message.

CC: libav-stable@libav.org
Bug-Id: CID 1265717

4 years agortpdec_hevc: Drop extra sanity check for size of input packet
Vittorio Giovara [Sun, 8 Mar 2015 23:42:59 +0000 (23:42 +0000)]
rtpdec_hevc: Drop extra sanity check for size of input packet

In this case len is always at least 3, since it is checked against
RTP_HEVC_PAYLOAD_HEADER_SIZE + 1 before entering the switch block.

Bug-Id: CID 1238784

4 years agoffmdec: make sure the time base is valid
Andreas Cadhalpun [Sun, 8 Mar 2015 22:12:59 +0000 (23:12 +0100)]
ffmdec: make sure the time base is valid

A negative time base can trigger assertions.

Signed-off-by: Andreas Cadhalpun <Andreas.Cadhalpun@googlemail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoMerge commit '46d4d8575979a24a8d026d9805039b724e0e3e5f'
Michael Niedermayer [Mon, 9 Mar 2015 10:21:50 +0000 (11:21 +0100)]
Merge commit '46d4d8575979a24a8d026d9805039b724e0e3e5f'

* commit '46d4d8575979a24a8d026d9805039b724e0e3e5f':
  movenc: Avoid writing separate flags for the first sample if not necessary

Merged-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoMerge commit '00d751d4fc20ec88d2cc2c9f39ec8b9e9c8cdeba'
Michael Niedermayer [Mon, 9 Mar 2015 10:08:33 +0000 (11:08 +0100)]
Merge commit '00d751d4fc20ec88d2cc2c9f39ec8b9e9c8cdeba'

* commit '00d751d4fc20ec88d2cc2c9f39ec8b9e9c8cdeba':
  movenc: Set tfhd default sample flags based on actual samples, if possible

Merged-by: Michael Niedermayer <michaelni@gmx.at>
4 years agodoc: Clarify documentation for fade duration.
Carl Eugen Hoyos [Mon, 9 Mar 2015 09:57:58 +0000 (10:57 +0100)]
doc: Clarify documentation for fade duration.

4 years agodoc: Improve video creation examples (from image2).
Carl Eugen Hoyos [Mon, 9 Mar 2015 09:49:59 +0000 (10:49 +0100)]
doc: Improve video creation examples (from image2).

The examples used to drop frames in most cases which
was probably not what users expected.

4 years agoFix the intra_dc_precision API doc.
Carl Eugen Hoyos [Mon, 9 Mar 2015 09:47:06 +0000 (10:47 +0100)]
Fix the intra_dc_precision API doc.

The mpegvideo decoder has set intra_dc_precision since forever.

4 years agolavc/ffv1enc: Auto-select -coder 1 for >8bit also for yuv.
Carl Eugen Hoyos [Mon, 9 Mar 2015 09:40:16 +0000 (10:40 +0100)]
lavc/ffv1enc: Auto-select -coder 1 for >8bit also for yuv.

Reported-by: Christoph Gerstbauer
4 years agomovenc: Avoid writing separate flags for the first sample if not necessary
Martin Storsjö [Fri, 6 Mar 2015 09:26:40 +0000 (11:26 +0200)]
movenc: Avoid writing separate flags for the first sample if not necessary

Signed-off-by: Martin Storsjö <martin@martin.st>
4 years agomovenc: Set tfhd default sample flags based on actual samples, if possible
Martin Storsjö [Fri, 6 Mar 2015 09:22:35 +0000 (11:22 +0200)]
movenc: Set tfhd default sample flags based on actual samples, if possible

This avoids assuming that e.g. audio samples are marked as
sync samples.

This allows omitting the sample flags from trun, if the default
flags happen to be right for all the samples.

Signed-off-by: Martin Storsjö <martin@martin.st>
4 years agoffmdec: fix infinite loop at EOF
Andreas Cadhalpun [Sun, 8 Mar 2015 22:31:48 +0000 (23:31 +0100)]
ffmdec: fix infinite loop at EOF

If EOF is reached, while skipping bytes, avio_tell(pb) won't change
anymore, resulting in an infinite loop.

Signed-off-by: Andreas Cadhalpun <Andreas.Cadhalpun@googlemail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoffmdec: initialize f_cprv, f_stvi and f_stau
Andreas Cadhalpun [Sun, 8 Mar 2015 21:52:47 +0000 (22:52 +0100)]
ffmdec: initialize f_cprv, f_stvi and f_stau

They are used in a switch statement, but it is not guaranteed that the
COMM case (where they are set to 0) is reached before the other cases.

Signed-off-by: Andreas Cadhalpun <Andreas.Cadhalpun@googlemail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoMerge commit '0ce3a0f9d9523a9bcad4c6d451ca5bbd7a4f420d'
Michael Niedermayer [Mon, 9 Mar 2015 01:01:39 +0000 (02:01 +0100)]
Merge commit '0ce3a0f9d9523a9bcad4c6d451ca5bbd7a4f420d'

* commit '0ce3a0f9d9523a9bcad4c6d451ca5bbd7a4f420d':
  utvideodec: Handle slice_height being zero

See: 3881606240953b9275a247a1c98a567f3c44890f
Merged-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoutvideodec: Handle slice_height being zero
Michael Niedermayer [Wed, 4 Mar 2015 17:36:14 +0000 (17:36 +0000)]
utvideodec: Handle slice_height being zero

Fixes out of array accesses.

CC: libav-stable@libav.org
Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Bug-Id: CVE-2014-9604
Signed-off-by: Vittorio Giovara <vittorio.giovara@gmail.com>
Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
4 years agoMerge commit '7b9cb7b36543c2a0e46d99b0e41824b9e7dd0c8f'
Michael Niedermayer [Sun, 8 Mar 2015 22:43:40 +0000 (23:43 +0100)]
Merge commit '7b9cb7b36543c2a0e46d99b0e41824b9e7dd0c8f'

* commit '7b9cb7b36543c2a0e46d99b0e41824b9e7dd0c8f':
  avprobe: Export coded_{width,height} in -show_streams

Conflicts:
avprobe.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoavcodec/tiff: move bpp check to after "end:"
Michael Niedermayer [Sun, 8 Mar 2015 22:27:43 +0000 (23:27 +0100)]
avcodec/tiff: move bpp check to after "end:"

This ensures that all current and future code-pathes get bpp checked

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoMerge commit 'ae5e1f3d663a8c9a532d89e588cbc61f171c9186'
Michael Niedermayer [Sun, 8 Mar 2015 21:52:14 +0000 (22:52 +0100)]
Merge commit 'ae5e1f3d663a8c9a532d89e588cbc61f171c9186'

* commit 'ae5e1f3d663a8c9a532d89e588cbc61f171c9186':
  tiff: Check that there is no aliasing in pixel format selection

See: e1c0cfaa419aa5d320540d5a1b3f8fd9b82ab7e5
Merged-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoRELEASE: update to 2.6.git
James Almer [Sun, 8 Mar 2015 21:58:12 +0000 (18:58 -0300)]
RELEASE: update to 2.6.git

Signed-off-by: James Almer <jamrial@gmail.com>
4 years agoffserver: remove stale debug stanza
Reynaldo H. Verdejo Pinochet [Sun, 8 Mar 2015 17:19:16 +0000 (14:19 -0300)]
ffserver: remove stale debug stanza

Signed-off-by: Reynaldo H. Verdejo Pinochet <reynaldo@osg.samsung.com>
4 years agoffserver: move assignment outside condition eval
Reynaldo H. Verdejo Pinochet [Sun, 8 Mar 2015 17:15:50 +0000 (14:15 -0300)]
ffserver: move assignment outside condition eval

Signed-off-by: Reynaldo H. Verdejo Pinochet <reynaldo@osg.samsung.com>
4 years agoffserver: break some too long lines
Reynaldo H. Verdejo Pinochet [Sun, 8 Mar 2015 17:11:35 +0000 (14:11 -0300)]
ffserver: break some too long lines

Signed-off-by: Reynaldo H. Verdejo Pinochet <reynaldo@osg.samsung.com>
4 years agodoc: avoid the incorrect phrase 'allow to'
Andreas Cadhalpun [Sat, 7 Mar 2015 18:36:07 +0000 (19:36 +0100)]
doc: avoid the incorrect phrase 'allow to'

Signed-off-by: Andreas Cadhalpun <Andreas.Cadhalpun@googlemail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoavprobe: Export coded_{width,height} in -show_streams
Vittorio Giovara [Sun, 8 Mar 2015 03:25:25 +0000 (03:25 +0000)]
avprobe: Export coded_{width,height} in -show_streams

4 years agoavfilter/vf_edgedetect: Change enums to int, which are accessed via AVOption as int
Michael Niedermayer [Sun, 8 Mar 2015 19:59:51 +0000 (20:59 +0100)]
avfilter/vf_edgedetect: Change enums to int, which are accessed via AVOption as int

This fixes depending on implementation defined behavior

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoavfilter/vf_curves: Change enums to int, which are accessed via AVOption as int
Michael Niedermayer [Sun, 8 Mar 2015 19:59:51 +0000 (20:59 +0100)]
avfilter/vf_curves: Change enums to int, which are accessed via AVOption as int

This fixes depending on implementation defined behavior

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoavfilter/vf_drawtext: Change enums to int, which are accessed via AVOption as int
Michael Niedermayer [Sun, 8 Mar 2015 19:59:51 +0000 (20:59 +0100)]
avfilter/vf_drawtext: Change enums to int, which are accessed via AVOption as int

This fixes depending on implementation defined behavior

4 years agofate: add test for vp90-2-trac4359.webm
James Almer [Sat, 7 Mar 2015 05:19:04 +0000 (02:19 -0300)]
fate: add test for vp90-2-trac4359.webm

Regression test for the bug from trac ticket #4359 fixed in commit efff3854

Reviewed-by: Michael Niedermayer <michaelni@gmx.at>
Signed-off-by: James Almer <jamrial@gmail.com>
4 years agoMerge commit '6448f15af02f2c3cf0df8cb8237957e426041f2d'
Michael Niedermayer [Sun, 8 Mar 2015 18:55:09 +0000 (19:55 +0100)]
Merge commit '6448f15af02f2c3cf0df8cb8237957e426041f2d'

* commit '6448f15af02f2c3cf0df8cb8237957e426041f2d':
  mxfdec: Fix the error handling for when strftime fails

Merged-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoMerge commit '5f5b78aca35d07c771f5c4c73a984be9fe04a0b8'
Michael Niedermayer [Sun, 8 Mar 2015 18:44:09 +0000 (19:44 +0100)]
Merge commit '5f5b78aca35d07c771f5c4c73a984be9fe04a0b8'

* commit '5f5b78aca35d07c771f5c4c73a984be9fe04a0b8':
  xcbgrab: Free the host string after checking the connection

Conflicts:
libavdevice/xcbgrab.c

No change as the bug was not in FFmpeg

Merged-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoMerge commit '0025f7408a0fab2cab4a950064e4784a67463994'
Michael Niedermayer [Sun, 8 Mar 2015 18:09:32 +0000 (19:09 +0100)]
Merge commit '0025f7408a0fab2cab4a950064e4784a67463994'

* commit '0025f7408a0fab2cab4a950064e4784a67463994':
  vorbis: Check the vlc value in setup_classifs

Conflicts:
libavcodec/vorbisdec.c

See: ae038c0914460646503be083e30e3971093239a1
See: 709cae2bcbc0ea2c5d46c932b3d8301cf8f98e6b
Merged-by: Michael Niedermayer <michaelni@gmx.at>
4 years agotiff: Check that there is no aliasing in pixel format selection
Anton Khirnov [Sat, 7 Mar 2015 21:06:59 +0000 (22:06 +0100)]
tiff: Check that there is no aliasing in pixel format selection

Fixes possible issues with unexpected bpp/bppcount values.

CC: libav-stable@libav.org
Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Bug-Id: CVE-2014-8544
Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
4 years agoMerge commit '62de77ffcaebd42fe685b8426da56b89b2532318'
Michael Niedermayer [Sun, 8 Mar 2015 17:56:07 +0000 (18:56 +0100)]
Merge commit '62de77ffcaebd42fe685b8426da56b89b2532318'

* commit '62de77ffcaebd42fe685b8426da56b89b2532318':
  vorbis: Use a local codebook variable

Merged-by: Michael Niedermayer <michaelni@gmx.at>
4 years agomxfdec: Fix the error handling for when strftime fails
Martin Storsjö [Sat, 7 Mar 2015 22:19:45 +0000 (00:19 +0200)]
mxfdec: Fix the error handling for when strftime fails

The str variable is a char ** here.

Signed-off-by: Martin Storsjö <martin@martin.st>
4 years agodoc/filters: Add some random examples for fftfilt
Michael Niedermayer [Sat, 7 Mar 2015 22:22:34 +0000 (23:22 +0100)]
doc/filters: Add some random examples for fftfilt

Reviewed-by: Timothy Gu <timothygu99@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 years agovp9: included uses_2pass member in vp9_ref_frame().
Ronald S. Bultje [Sun, 8 Mar 2015 13:21:42 +0000 (09:21 -0400)]
vp9: included uses_2pass member in vp9_ref_frame().

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoxcbgrab: Free the host string after checking the connection
Luca Barbato [Thu, 5 Mar 2015 08:44:55 +0000 (09:44 +0100)]
xcbgrab: Free the host string after checking the connection

Prevent an use after free in the error message.

Bug-Id: CID 1274040
CC: libav-stable@libav.org
4 years agovorbis: Check the vlc value in setup_classifs
Luca Barbato [Tue, 3 Mar 2015 10:05:15 +0000 (11:05 +0100)]
vorbis: Check the vlc value in setup_classifs

The valid returned values are always at most 11bit.
Remove the previous check that assumed larger values plausible and
use a signed integer to check get_vlc2 return values.

CC: libav-stable@libav.org