]>
git.sesse.net Git - ffmpeg/log
Michael Niedermayer [Thu, 12 Mar 2015 01:01:33 +0000 (02:01 +0100)]
avcodec/vp9: Fix undefined shifts in decode_frame_header()
Found-by: Clang -fsanitize=shift
Reported-by: Thierry Foucu <tfoucu@google.com>
Reviewed-by: "Ronald S. Bultje" <rsbultje@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Thu, 12 Mar 2015 00:49:48 +0000 (01:49 +0100)]
avcodec/h264_mb: Fix undefined shifts
Found-by: Clang -fsanitize=shift
Reported-by: Thierry Foucu <tfoucu@google.com>
Reviewed-by: "Ronald S. Bultje" <rsbultje@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Rainer Hochecker [Thu, 12 Mar 2015 13:08:25 +0000 (14:08 +0100)]
hevc: delay ff_thread_finish_setup for hwaccel
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Thu, 12 Mar 2015 11:37:13 +0000 (12:37 +0100)]
Merge commit '
b97f427fb56bdbf7de8e2d4b72d01114aa6eceda '
* commit '
b97f427fb56bdbf7de8e2d4b72d01114aa6eceda ':
lavf: Explicitly convert types at function pointer assignment
Conflicts:
libavformat/avio.c
libavformat/aviobuf.c
libavformat/swfenc.c
See:
a76a2ffe9d7773d59bb1bc228a6660e23672c490 and others
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Thu, 12 Mar 2015 11:25:29 +0000 (12:25 +0100)]
Merge commit '
9c8074050745184a61059ad56045ad711299e33d '
* commit '
9c8074050745184a61059ad56045ad711299e33d ':
configure: Mark qsv subsystem as not selectable on the command line
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Yayoi [Tue, 10 Mar 2015 05:01:47 +0000 (22:01 -0700)]
avfilter/colormatrix:add slice threading
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Wed, 14 Jan 2015 23:42:55 +0000 (00:42 +0100)]
avutil/buffer: Avoid moving the AVBufferRef to a new place in memory in av_buffer_make_writable()
This allows making a AVBufferRef writable without the need to
update all pointers to it
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Wed, 14 Jan 2015 23:42:55 +0000 (00:42 +0100)]
avutil/buffer: Avoid moving the AVBufferRef to a new place in memory in av_buffer_realloc()
This allows reallocating AVBufferRefs without the need to update
all pointers to it
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Wed, 11 Mar 2015 23:31:20 +0000 (00:31 +0100)]
Merge commit '
67142a8c721c7916c9ad2eb439c14d567aeb88c1 '
* commit '
67142a8c721c7916c9ad2eb439c14d567aeb88c1 ':
roqvideoenc: set enc->avctx in roq_encode_init
See:
cf82c426fadf90105e1fb9d5ecd267cc3aa2b288
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Wed, 11 Mar 2015 23:23:28 +0000 (00:23 +0100)]
Merge commit '
72211a2af0470799c9611b9c1c7039ab14a34a0a '
* commit '
72211a2af0470799c9611b9c1c7039ab14a34a0a ':
asfenc: fix leaking asf->index_ptr on error
See:
2c8cff2be4a044c66e4904efa156dafd0d332d25
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Wed, 11 Mar 2015 23:14:43 +0000 (00:14 +0100)]
Merge commit '
212556cd2144659dc6b9d121ddb38cd272bd10ae '
* commit '
212556cd2144659dc6b9d121ddb38cd272bd10ae ':
qsv: Improve the log message of when initializing MFX_IMPL_HARDWARE{2, 3, 4}
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diego Biurrun [Tue, 10 Feb 2015 15:02:30 +0000 (16:02 +0100)]
lavf: Explicitly convert types at function pointer assignment
This fixes a number of "assignment from incompatible pointer type" warnings.
Diego Biurrun [Wed, 11 Mar 2015 09:39:26 +0000 (10:39 +0100)]
configure: Mark qsv subsystem as not selectable on the command line
Michael Niedermayer [Wed, 11 Mar 2015 19:38:08 +0000 (20:38 +0100)]
Merge commit '
7a76c6c4df31d1ff65464ccf3171acd57ef004eb '
* commit '
7a76c6c4df31d1ff65464ccf3171acd57ef004eb ':
configure: Enable colored output for gcc 4.9+
Conflicts:
configure
Merged-by: Michael Niedermayer <michaelni@gmx.at>
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>
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.
CC:libav-stable@libav.org
Signed-off-by: Andreas Cadhalpun <Andreas.Cadhalpun@googlemail.com>
Signed-off-by: Anton Khirnov <anton@khirnov.net>
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: Anton Khirnov <anton@khirnov.net>
Michael Niedermayer [Wed, 11 Mar 2015 19:17:40 +0000 (20:17 +0100)]
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>
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>
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>
Yukinori Yamazoe [Wed, 11 Mar 2015 09:04:30 +0000 (18:04 +0900)]
qsv: Improve the log message of when initializing MFX_IMPL_HARDWARE{2, 3, 4}
Signed-off-by: Anton Khirnov <anton@khirnov.net>
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>
Vittorio Giovara [Mon, 9 Mar 2015 01:02:01 +0000 (01:02 +0000)]
configure: Enable colored output for gcc 4.9+
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
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
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>
Vittorio Giovara [Wed, 11 Mar 2015 14:56:52 +0000 (14:56 +0000)]
matroskaenc: Fix type used for chapter timestamps
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>
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>
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>
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>
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>
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>
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>
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>
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>
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>
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>
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>
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>
Carl Eugen Hoyos [Tue, 10 Mar 2015 21:55:30 +0000 (22:55 +0100)]
lavfi/boxblur: Fix colourpsace list.
Fixes ticket #4363.
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>
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>
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>
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>
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
Carl Eugen Hoyos [Tue, 10 Mar 2015 11:14:16 +0000 (12:14 +0100)]
lavc/hevcdsp: Fix compilation for arm with --disable-neon.
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
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
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
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>
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>
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>
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>
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>
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>
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>
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>
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>
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>
Anton Khirnov [Mon, 9 Mar 2015 09:56:54 +0000 (10:56 +0100)]
FATE: add support for testing hwaccels
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.
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>
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>
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>
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>
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>
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>
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>
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>
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>
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>
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>
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>
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>
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>
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>
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>
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
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
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
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>
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>
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>
Carl Eugen Hoyos [Mon, 9 Mar 2015 09:57:58 +0000 (10:57 +0100)]
doc: Clarify documentation for fade duration.
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.
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.
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
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>
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>
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>
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>
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>
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>
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>
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>
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>
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>
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>