]>
git.sesse.net Git - ffmpeg/log
Michael Niedermayer [Wed, 15 Oct 2014 16:47:44 +0000 (18:47 +0200)]
Merge commit '
557d4c4ecae080729e68df54ed2bd8420d0f037a '
* commit '
557d4c4ecae080729e68df54ed2bd8420d0f037a ':
avconv: replace AVCodecContext.time_base with framerate
Conflicts:
ffmpeg.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Wed, 15 Oct 2014 16:23:21 +0000 (18:23 +0200)]
avformat/utils: use av_reduce() to simplify code and avoid overflow in ff_compute_frame_duration()
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Wed, 15 Oct 2014 14:24:43 +0000 (16:24 +0200)]
Merge commit '
2d6e58497e76836604364b037df9b00ba3d75b69 '
* commit '
2d6e58497e76836604364b037df9b00ba3d75b69 ':
lavf: switch to AVCodecContext.framerate for demuxing
Conflicts:
libavformat/utils.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Wed, 15 Oct 2014 13:57:15 +0000 (15:57 +0200)]
avcodec/dpx: fix framerate
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Wed, 15 Oct 2014 13:54:02 +0000 (15:54 +0200)]
avcodec/vc1: fix time_base and framerate
They are not just inverses of each other.
This should restore behavior to before the introduction of framerate
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Wed, 15 Oct 2014 13:54:02 +0000 (15:54 +0200)]
avcodec/h264: fix time_base and framerate
They are not just inverses of each other.
This should restore behavior to before the introduction of framerate
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Wed, 15 Oct 2014 13:54:02 +0000 (15:54 +0200)]
avcodec/mpeg12dec: fix time_base and framerate
They are not just inverses of each other.
This should restore behavior to before the introduction of framerate
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Wed, 15 Oct 2014 13:50:49 +0000 (15:50 +0200)]
avcodec/utils: fix time_base after the framerate addition
time_base != 1/framerate for example for interlaced video
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Wed, 15 Oct 2014 11:38:10 +0000 (13:38 +0200)]
Merge commit '
7ea1b3472a61de4aa4d41b571e99418e4997ad41 '
* commit '
7ea1b3472a61de4aa4d41b571e99418e4997ad41 ':
lavc: deprecate the use of AVCodecContext.time_base for decoding
Conflicts:
libavcodec/avcodec.h
libavcodec/h264.c
libavcodec/mpegvideo_parser.c
libavcodec/utils.c
libavcodec/version.h
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Wed, 15 Oct 2014 10:30:07 +0000 (12:30 +0200)]
Merge commit '
d565fef1b83b6c5f8afb32229260b79f67c68109 '
* commit '
d565fef1b83b6c5f8afb32229260b79f67c68109 ':
vdpau: add AV_HWACCEL_FLAG_IGNORE_LEVEL to skip the codec level check
Conflicts:
libavcodec/version.h
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Wed, 15 Oct 2014 10:17:15 +0000 (12:17 +0200)]
Merge commit '
c1724623ce0433c6a9ee72133b1fd4db75ec7193 '
* commit '
c1724623ce0433c6a9ee72133b1fd4db75ec7193 ':
vdpau: have av_vdpau_bind_context() fail on unsupported flag
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Wed, 15 Oct 2014 10:08:09 +0000 (12:08 +0200)]
Merge commit '
e09a947c1a856d9d34199a13ee378fe46be53d3a '
* commit '
e09a947c1a856d9d34199a13ee378fe46be53d3a ':
doc: fix typing mistake
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Anton Khirnov [Fri, 4 Apr 2014 11:06:22 +0000 (13:06 +0200)]
avconv: replace AVCodecContext.time_base with framerate
Anton Khirnov [Wed, 8 Oct 2014 19:23:14 +0000 (19:23 +0000)]
lavf: switch to AVCodecContext.framerate for demuxing
Anton Khirnov [Fri, 4 Apr 2014 10:47:44 +0000 (12:47 +0200)]
lavc: deprecate the use of AVCodecContext.time_base for decoding
When decoding, this field holds the inverse of the framerate that can be
written in the headers for some codecs. Using a field called 'time_base'
for this is very misleading, as there are no timestamps associated with
it. Furthermore, this field is used for a very different purpose during
encoding.
Add a new field, called 'framerate', to replace the use of time_base for
decoding.
Rémi Denis-Courmont [Tue, 14 Oct 2014 09:59:54 +0000 (12:59 +0300)]
vdpau: add AV_HWACCEL_FLAG_IGNORE_LEVEL to skip the codec level check
Decoding acceleration may work even if the codec level is higher than
the stated limit of the VDPAU driver. Or the problem may be considered
acceptable by the user. This flag allows skipping the codec level
capability checks and proceed with decoding.
Applications should obviously not set this flag by default, but only if
the user explicitly requested this behavior (and presumably knows how
to turn it back off if it fails).
Signed-off-by: Anton Khirnov <anton@khirnov.net>
Rémi Denis-Courmont [Tue, 14 Oct 2014 09:59:53 +0000 (12:59 +0300)]
vdpau: have av_vdpau_bind_context() fail on unsupported flag
Currently, no flags are supported.
Signed-off-by: Anton Khirnov <anton@khirnov.net>
Rémi Denis-Courmont [Tue, 14 Oct 2014 09:59:52 +0000 (12:59 +0300)]
doc: fix typing mistake
Signed-off-by: Anton Khirnov <anton@khirnov.net>
Michael Niedermayer [Wed, 15 Oct 2014 00:20:58 +0000 (02:20 +0200)]
avformat/mxfdec: cleanup if parsing the header metadata fails
Fixes memleaks
Fixes: asan_static-oob_87d116_10_201.mxf
Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Wed, 15 Oct 2014 00:16:18 +0000 (02:16 +0200)]
avformat/mxfdec: Fix memleak of packages_refs
Fixes: asan_static-oob_87d116_10_201.mxf
Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Wed, 15 Oct 2014 00:16:18 +0000 (02:16 +0200)]
avformat/mxfdec: Fix memleak of primer_packs
Fixes: asan_static-oob_87d116_10_201.mxf
Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Tue, 14 Oct 2014 23:36:04 +0000 (01:36 +0200)]
avformat/mxfdec: Fix termination of mxf_data_essence_container_uls
Fixes: asan_static-oob_87d116_10_201.mxf
Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Tue, 14 Oct 2014 20:23:01 +0000 (22:23 +0200)]
Merge commit '
a74f8121d88e0bdf0d69c22e4b3713032da9300a '
* commit '
a74f8121d88e0bdf0d69c22e4b3713032da9300a ':
mov: Handle tfdt atoms
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Tue, 14 Oct 2014 19:51:33 +0000 (21:51 +0200)]
Merge commit '
c2c22c75cf89e2faab34d1ee1d392cfb065439ea '
* commit '
c2c22c75cf89e2faab34d1ee1d392cfb065439ea ':
movenc: Write tfdt atoms
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Tue, 14 Oct 2014 16:52:51 +0000 (18:52 +0200)]
avcodec/iirfilter: Make ff_iir_filter_free_state() also zero the freed pointer
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Tue, 14 Oct 2014 16:30:52 +0000 (18:30 +0200)]
avcodec/iirfilter: Change ff_iir_filter_free_coeffs() so it clears the pointers as well
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Tue, 14 Oct 2014 16:30:15 +0000 (18:30 +0200)]
avcodec/flac_parser: use av_freep(), do not leave stale pointers in memory
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Tue, 14 Oct 2014 16:29:49 +0000 (18:29 +0200)]
avcodec/flac_parser: use av_freep(), do not leave stale pointers in memory
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Tue, 14 Oct 2014 15:15:56 +0000 (17:15 +0200)]
avfilter/vf_pp: add gbrp support
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Martin Storsjö [Sat, 11 Oct 2014 22:24:26 +0000 (01:24 +0300)]
mov: Handle tfdt atoms
Signed-off-by: Martin Storsjö <martin@martin.st>
Martin Storsjö [Mon, 6 Oct 2014 20:20:50 +0000 (23:20 +0300)]
movenc: Write tfdt atoms
These allow getting the absolute start timestamp of a fragment
without reading preceding timestamps. This fixes sync between
tracks if starting from fragments in different streams that don't
align exactly.
This also is a prerequisite for producing DASH content.
Signed-off-by: Martin Storsjö <martin@martin.st>
Michael Niedermayer [Tue, 14 Oct 2014 01:53:17 +0000 (03:53 +0200)]
avformat/mp3enc: use initial_padding
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Tue, 14 Oct 2014 01:30:03 +0000 (03:30 +0200)]
ffmpeg: Fix stream copy with initial_padding
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Tue, 14 Oct 2014 01:00:17 +0000 (03:00 +0200)]
Merge commit '
eabdc2a830f1ab1a3f12243eb7e2fba801cb81f0 '
* commit '
eabdc2a830f1ab1a3f12243eb7e2fba801cb81f0 ':
lavf: use initial_padding instead of deprecated delay
Conflicts:
libavformat/matroskaenc.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Tue, 14 Oct 2014 00:46:51 +0000 (02:46 +0200)]
avcodec/ac3enc_template: use the initial_padding field
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Tue, 14 Oct 2014 00:16:16 +0000 (02:16 +0200)]
Merge commit '
2df0c32ea12ddfa72ba88309812bfb13b674130f '
* commit '
2df0c32ea12ddfa72ba88309812bfb13b674130f ':
lavc: use a separate field for exporting audio encoder padding
Conflicts:
libavcodec/audio_frame_queue.c
libavcodec/avcodec.h
libavcodec/libvorbisenc.c
libavcodec/utils.c
libavcodec/version.h
libavcodec/wmaenc.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Mon, 13 Oct 2014 23:54:13 +0000 (01:54 +0200)]
avcodec/aacdec: print element types when debug startcode is set
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Mon, 13 Oct 2014 22:03:43 +0000 (00:03 +0200)]
Merge commit '
c80a816142699dea9cf9fa66689a7838a487ed7e '
* commit '
c80a816142699dea9cf9fa66689a7838a487ed7e ':
h263dec: call get_format() on resolution changes
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Mon, 13 Oct 2014 21:45:52 +0000 (23:45 +0200)]
avformat/utils: print more information with av_dlog() in compute_pkt_fields()
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Mon, 13 Oct 2014 20:12:56 +0000 (22:12 +0200)]
Merge commit '
1f29e5d7a2b0950f3b6820896e97e2c02e6a10a9 '
* commit '
1f29e5d7a2b0950f3b6820896e97e2c02e6a10a9 ':
h263dec: call get_format after setting resolution and profile
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Anton Khirnov [Sat, 23 Aug 2014 13:12:51 +0000 (13:12 +0000)]
lavf: use initial_padding instead of deprecated delay
Anton Khirnov [Sat, 23 Aug 2014 12:40:50 +0000 (12:40 +0000)]
lavc: use a separate field for exporting audio encoder padding
Currently, the amount of padding inserted at the beginning by some audio
encoders, is exported through AVCodecContext.delay. However
- the term 'delay' is heavily overloaded and can have multiple different
meanings even in the case of audio encoding.
- this field has entirely different meanings, depending on whether the
codec context is used for encoding or decoding (and has yet another
different meaning for video), preventing generic handling of the codec
context.
Therefore, add a new field -- AVCodecContext.initial_padding. It could
conceivably be used for decoding as well at a later point.
Benoit Fouet [Mon, 13 Oct 2014 07:35:11 +0000 (09:35 +0200)]
avformat/movenc: add support for syncframes concatenation for E-AC-3.
E-AC-3 samples should contain 6 audio blocks, so concatenate syncframes
in order to achieve this.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Benoit Fouet [Mon, 13 Oct 2014 12:42:55 +0000 (14:42 +0200)]
avcodec/aacdec: map LFE[0] to SCE[1] for 4.0 audio.
Fixes ticket #3930
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Mon, 13 Oct 2014 14:02:42 +0000 (16:02 +0200)]
postproc: fix qp count
Found-by: ubitux
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Mon, 13 Oct 2014 11:36:06 +0000 (13:36 +0200)]
avformat/mov: fix mix of declaration and statement
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Rémi Denis-Courmont [Wed, 8 Oct 2014 17:37:01 +0000 (20:37 +0300)]
h263dec: call get_format() on resolution changes
Fail safe if the pixel format changes.
Rémi Denis-Courmont [Wed, 8 Oct 2014 17:37:00 +0000 (20:37 +0300)]
h263dec: call get_format after setting resolution and profile
Bug-Id: 541
Paul B Mahol [Mon, 13 Oct 2014 12:22:41 +0000 (12:22 +0000)]
libavcodec/libtwolame: fix null pointer dereference
Signed-off-by: Paul B Mahol <onemda@gmail.com>
Mika Raento [Sat, 11 Oct 2014 15:43:48 +0000 (18:43 +0300)]
mov.c: allow reading fragment start dts/pts from fragmented mp4
This introduces a new option to the mov demuxer: -use_mfra_for
(pts|dts). When it's given and moofs and a MFRA are present, the MFRA's
TFRAs are read for fragment start times.
Unfortunately some programs that produce fragmented mp4s use the TFRA
time field for dts and some for pts. There is no realistic way to detect
which is the case, hence the responsibility is punted onto the user.
This also means that no behavioural change is enabled by default - you
must pass either dts or pts for anything to happen.
Without this change, timestamps for some discontinuous fragmented mp4 are
wrong, and cause audio/video desync and are not usable for generating
HLS.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Sun, 12 Oct 2014 23:56:14 +0000 (01:56 +0200)]
avfilter/vf_pp: support AV_PIX_FMT_GRAY8
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Sun, 12 Oct 2014 23:55:36 +0000 (01:55 +0200)]
libpostproc: support grayscale
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Sun, 12 Oct 2014 23:26:48 +0000 (01:26 +0200)]
Merge commit '
76c70e33d2244a688832f03b53862eb5d9ad3b01 '
* commit '
76c70e33d2244a688832f03b53862eb5d9ad3b01 ':
icecast: Do not use chunked post
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Sun, 12 Oct 2014 23:15:13 +0000 (01:15 +0200)]
Merge commit '
e44ee1eb8db7393e9d43207c2e1812720e292e6d '
* commit '
e44ee1eb8db7393e9d43207c2e1812720e292e6d ':
movenc: Simplify code by using an existing local pointer
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Sun, 12 Oct 2014 23:10:13 +0000 (01:10 +0200)]
Merge commit '
dad12ce452a9d69c0d9d53c375003947d5f1b02e '
* commit '
dad12ce452a9d69c0d9d53c375003947d5f1b02e ':
movenc: Print a warning for an unhandled case of nonzero start dts with empty_moov
Conflicts:
libavformat/movenc.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Sun, 12 Oct 2014 21:26:28 +0000 (23:26 +0200)]
Merge commit '
dbb472cb2f2f799295a12b4922a6a8be2cccfdee '
* commit '
dbb472cb2f2f799295a12b4922a6a8be2cccfdee ':
movenc: Write edit lists for fragmented files as well, if necessary
Conflicts:
libavformat/movenc.c
The default for writing EDTS for fragmented mp4 is left at disabled
this can be overridden via command line with -use_editlist
but EDTS + fragments still does not fully work, which is why it is
left disabled by default
Merged-by: Michael Niedermayer <michaelni@gmx.at>
James Almer [Sun, 12 Oct 2014 20:18:47 +0000 (17:18 -0300)]
fate: add test for vp90-2-trac3849.webm
Regression test for the bug from trac ticket #3849 fixed in commit
14e30255
Reviewed-by: Ronald S. Bultje <rsbultje@gmail.com>
Signed-off-by: James Almer <jamrial@gmail.com>
Michael Niedermayer [Sun, 12 Oct 2014 20:48:17 +0000 (22:48 +0200)]
Merge commit '
95ee4e2ce774e0339632d067161596bf3dadfc72 '
* commit '
95ee4e2ce774e0339632d067161596bf3dadfc72 ':
movenc: Add some comments explaining subtle details in writing the edit lists
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Sun, 12 Oct 2014 20:37:33 +0000 (22:37 +0200)]
Merge commit '
72f801619a1ae91969fee9a7d72519422433c998 '
* commit '
72f801619a1ae91969fee9a7d72519422433c998 ':
movenc: Adjust edit lists to trim out parts of tracks with negative pts
Conflicts:
libavformat/movenc.c
See:
66b45d8f7a1bfba1065286361ab571cb9cfd87c6
See:
14fd34d73bb0bcb227b62506fb51d63751c9b190
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Sun, 12 Oct 2014 20:29:10 +0000 (22:29 +0200)]
Merge commit '
8bef43388132b53f59a6e90add18900a3bb4cc60 '
* commit '
8bef43388132b53f59a6e90add18900a3bb4cc60 ':
smoothstreamingenc: Simplify code by removing a redundant variable
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Sun, 12 Oct 2014 18:26:27 +0000 (20:26 +0200)]
postproc/postprocess: fix quant store for fq mode
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Sun, 12 Oct 2014 17:13:20 +0000 (19:13 +0200)]
avfilter/vf_pp: add yuv 4:4:0 support
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Sun, 12 Oct 2014 17:11:53 +0000 (19:11 +0200)]
postprocess: add YUV 4:4:0 support
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
James Almer [Sun, 12 Oct 2014 18:54:58 +0000 (15:54 -0300)]
avfilter: remove obsolete FF_API_DRAWTEXT_OLD_TIMELINE cruft
Mark McGough [Sun, 12 Oct 2014 10:24:07 +0000 (18:24 +0800)]
icecast: Do not use chunked post
Icecast uses HTTP 1.0 while Libav uses HTTP 1.1 and enables by
default chunked post.
Icecast actually forwards the HTTP chunk headers to the listener
as part of the media stream (without the chunk encoding HTTP headers)
causing the players to lose sync.
Disabling the option is enough to feed icecast properly.
Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
Martin Storsjö [Sat, 11 Oct 2014 21:14:48 +0000 (00:14 +0300)]
movenc: Simplify code by using an existing local pointer
Signed-off-by: Martin Storsjö <martin@martin.st>
Martin Storsjö [Sat, 11 Oct 2014 21:33:24 +0000 (00:33 +0300)]
movenc: Print a warning for an unhandled case of nonzero start dts with empty_moov
Signed-off-by: Martin Storsjö <martin@martin.st>
Martin Storsjö [Sat, 11 Oct 2014 21:03:25 +0000 (00:03 +0300)]
movenc: Write edit lists for fragmented files as well, if necessary
This is necessary to get the right timestamp offset for content
that starts with dts != 0.
This currently only helps when writing fragmented files with a non-empty
moov atom. When writing an empty moov atom, we don't have any packets
yet, so we don't know the starting dts for the tracks.
Signed-off-by: Martin Storsjö <martin@martin.st>
Martin Storsjö [Sat, 11 Oct 2014 20:56:24 +0000 (23:56 +0300)]
movenc: Add some comments explaining subtle details in writing the edit lists
Signed-off-by: Martin Storsjö <martin@martin.st>
Michael Niedermayer [Sat, 29 Sep 2012 04:31:18 +0000 (06:31 +0200)]
movenc: Adjust edit lists to trim out parts of tracks with negative pts
This makes sure that audio preroll for e.g. AAC is signaled correctly.
Previously we only wrote the edit list correctly if we had negative
dts but started with pts == 0 (e.g. for video with B-frames).
Signed-off-by: Martin Storsjö <martin@martin.st>
Martin Storsjö [Mon, 6 Oct 2014 07:06:37 +0000 (10:06 +0300)]
smoothstreamingenc: Simplify code by removing a redundant variable
Signed-off-by: Martin Storsjö <martin@martin.st>
Michael Niedermayer [Sun, 12 Oct 2014 10:22:00 +0000 (12:22 +0200)]
avcodec/eatgv: use av_freep(), do not leave stale pointers in memory
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Sun, 12 Oct 2014 10:22:00 +0000 (12:22 +0200)]
avcodec/eatqi: use av_freep(), do not leave stale pointers in memory
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Sun, 12 Oct 2014 02:46:55 +0000 (04:46 +0200)]
avcodec/error_resilience: avoid pointer arithmetic with NULL
move the code after the existing NULL check
Fixes: signal_sigsegv_844d59_10_signal_sigsegv_a17bb7_366_mpegts_mpeg2video_mp2_dvbsub_topfield.rec
Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Sat, 11 Oct 2014 22:52:46 +0000 (00:52 +0200)]
Merge commit '
bd239c9a2e151c0aeeb653a571f130aae7320894 '
* commit '
bd239c9a2e151c0aeeb653a571f130aae7320894 ':
lavf: Don't drop both pts and dts if timestamps are invalid
Conflicts:
libavformat/utils.c
tests/ref/fate/vc1-ism
See:
cd6851c5ef281e44af7028e08597c4dfb73d880f
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Wed, 16 Nov 2011 00:19:35 +0000 (01:19 +0100)]
lavf: Don't drop both pts and dts if timestamps are invalid
In these cases, only drop dts. Because if we drop both we have no
timestamps at all for some files.
This improves playback of HLS streams from GoPro cameras.
Signed-off-by: Martin Storsjö <martin@martin.st>
Michael Niedermayer [Sat, 11 Oct 2014 22:25:47 +0000 (00:25 +0200)]
avcodec/mjpegdec: sanity check bits
Fixes undefined shift
Fixes: asan_heap-oob_16668e9_2_asan_heap-oob_16668e9_346_miss_congeniality_pegasus_mjpg.avi
Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Karl Kiniger [Sat, 11 Oct 2014 20:34:11 +0000 (22:34 +0200)]
vf_drawtext: add missing clear of pointers after av_expr_free()
Fixes segfault when using sendcmd with drawtext.
Since LIBAVFILTER_VERSION_MAJOR 5 FF_API_DRAWTEXT_OLD_TIMELINE
evaluates to 0.
Signed-off-by: Karl Kiniger <karl.kiniger@med.ge.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Sat, 11 Oct 2014 20:50:51 +0000 (22:50 +0200)]
avcodec/dct: use av_freep(), do not leave stale pointers in memory
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Sat, 11 Oct 2014 20:50:51 +0000 (22:50 +0200)]
avcodec/dirac_parser: use av_freep(), do not leave stale pointers in memory
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Sat, 11 Oct 2014 20:50:51 +0000 (22:50 +0200)]
avcodec/eamad: use av_freep(), do not leave stale pointers in memory
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Simon Thelen [Fri, 10 Oct 2014 21:04:01 +0000 (23:04 +0200)]
ffmpeg_opt: abort if -to <= -ss
Makes ffmpeg abort instead of continuing when stop_time <= start_time.
Closes ticket #4015.
Signed-off-by: Simon Thelen <ffmpeg-dev@c-14.de>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Christophe Gisquet [Sat, 30 Aug 2014 13:04:03 +0000 (15:04 +0200)]
proresenc_ks: use chroma sampling in autoselection
If the chroma planes aren't subsampled, automatically select
the 4:4:4:4 profile.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Ruoyu [Sat, 11 Oct 2014 03:50:20 +0000 (11:50 +0800)]
avutil/lzo: fix resource leak
Signed-off-by: Ruoyu <liangry@ucweb.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Wed, 8 Oct 2014 00:05:54 +0000 (02:05 +0200)]
swscale: support internal scaler cascades
Fixes Ticket3170
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Sat, 11 Oct 2014 01:22:16 +0000 (03:22 +0200)]
avcodec/mpeg12dec: print aspect_ratio_info in debug output
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Fri, 10 Oct 2014 21:35:41 +0000 (23:35 +0200)]
Merge commit '
1d4579e38ecad578c86516fad2837a273d11b320 '
* commit '
1d4579e38ecad578c86516fad2837a273d11b320 ':
tcp: Add AVOption support
Conflicts:
libavformat/tcp.c
See:
2e009c6042bde419599ebed9165e597bbef23b2f
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Clément Bœsch [Fri, 10 Oct 2014 21:49:38 +0000 (23:49 +0200)]
avformat/assenc: make sure we crawl extradata only if it's non-null
Michael Niedermayer [Fri, 10 Oct 2014 19:44:17 +0000 (21:44 +0200)]
Merge commit '
cd9d6399fd00f5aeacaa90cdc0b74c3570024119 '
* commit '
cd9d6399fd00f5aeacaa90cdc0b74c3570024119 ':
tls: Support passing old-style tcp options
See:
4f4eb380f0f96dbb7cdd2b812fa92b8b47a0f27c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Fri, 10 Oct 2014 19:36:08 +0000 (21:36 +0200)]
Merge commit '
3df8d52fcdc9036b4074fdc612d487ece8bb5b7f '
* commit '
3df8d52fcdc9036b4074fdc612d487ece8bb5b7f ':
rtsp: Add rtsps to the probe
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Fri, 10 Oct 2014 19:28:50 +0000 (21:28 +0200)]
Merge commit '
c839b0439f0b01c72a6d253920d2e342b30f8bcb '
* commit '
c839b0439f0b01c72a6d253920d2e342b30f8bcb ':
rtsp: Support tls when in listen mode
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Fri, 10 Oct 2014 19:18:41 +0000 (21:18 +0200)]
Merge commit '
8b2e9636c57b22582143467a8a06b509b47b92f9 '
* commit '
8b2e9636c57b22582143467a8a06b509b47b92f9 ':
rtsp: Support tls-encapsulated RTSP
Conflicts:
libavformat/rtsp.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Fri, 10 Oct 2014 19:05:49 +0000 (21:05 +0200)]
Merge commit '
c27328e749ff3be648411765cd17362fee017341 '
* commit '
c27328e749ff3be648411765cd17362fee017341 ':
rtsp: Check for command strings without spaces
Conflicts:
libavformat/rtspdec.c
See:
a0568ed2544025de3c66dd500811f5ba43f38af4
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Fri, 10 Oct 2014 18:51:52 +0000 (20:51 +0200)]
Merge commit '
09e1ccc8cddc946da5e10841f10dc5ebdd187d9d '
* commit '
09e1ccc8cddc946da5e10841f10dc5ebdd187d9d ':
sctp: Use AVERROR_BUG instead of abort()
Conflicts:
libavformat/sctp.c
See:
2e59142fa9a0db5fab8aa2e676ba524f61280b83
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Fri, 10 Oct 2014 18:34:14 +0000 (20:34 +0200)]
Merge commit '
eb4f9069002e73648f6640cd054fc814cfda75b8 '
* commit '
eb4f9069002e73648f6640cd054fc814cfda75b8 ':
lavf: More informative error message
Conflicts:
libavformat/mux.c
See:
30ced7e69f434bd49b39fb7c8ce02d9ba71babfc
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Christophe Gisquet [Thu, 9 Oct 2014 21:27:38 +0000 (23:27 +0200)]
utvideoenc: properly set slice height/last line
Mimic decoder and obey sampling.
Does not affect fate tests for utvideo.
Fixes ticket #3949.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Fri, 10 Oct 2014 17:36:12 +0000 (19:36 +0200)]
avutil/softfloat: Fix undefined shift in av_add_sf()
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Benoit Fouet [Tue, 7 Oct 2014 12:57:19 +0000 (14:57 +0200)]
avformat/movenc: add EAC3 muxing support.
Support only one independent substream right now, and only syncframes
containing 6 blocks.
Fixes part of ticket #3074
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
James Almer [Fri, 10 Oct 2014 05:18:14 +0000 (02:18 -0300)]
float_dsp-test: allow forcing cpuflags
Reviewed-by: Michael Niedermayer <michaelni@gmx.at>
Signed-off-by: James Almer <jamrial@gmail.com>
Michael Niedermayer [Fri, 10 Oct 2014 15:09:46 +0000 (17:09 +0200)]
avcodec/atrac3: use av_freep(), do not leave stale pointers in memory
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>