]>
git.sesse.net Git - ffmpeg/log
Michael Niedermayer [Fri, 17 Oct 2014 10:37:40 +0000 (12:37 +0200)]
avformat/m4vdec: mark as possibly containing discontinuities
This will be needed for the resolution change mpeg4 test
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Moritz Barsnick [Wed, 15 Oct 2014 13:44:33 +0000 (15:44 +0200)]
doc/filters.texi: fix several typos in the vidstab* sections
Also create an anchor for the unsharp filter, and references to
it in its mentions.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
James Almer [Fri, 17 Oct 2014 01:24:42 +0000 (22:24 -0300)]
x86/vf_noise: move asm code to a separate file
Reviewed-by: Michael Niedermayer <michaelni@gmx.at>
Signed-off-by: James Almer <jamrial@gmail.com>
Michael Niedermayer [Thu, 16 Oct 2014 19:18:15 +0000 (21:18 +0200)]
swresample/resample: fix invert_initial_buffer() after flush
Fixes: asan_heap-uaf_2071250_7_139.ogg
Fixes: assertion failure
Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Thu, 16 Oct 2014 16:18:40 +0000 (18:18 +0200)]
swresample: do not put multiple statements in one line
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Benoit Fouet [Thu, 16 Oct 2014 09:44:46 +0000 (11:44 +0200)]
avformat/id3v2: silence a warning when CONFIG_ZLIB is unset.
dlen is only read when CONFIG_ZLIB is set, so mark it as possibly
unused.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Thu, 16 Oct 2014 13:05:17 +0000 (15:05 +0200)]
avfilter/vf_noise: Use a separate seed for each plane
This should reduce the correlation between planes
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Thu, 16 Oct 2014 12:51:04 +0000 (14:51 +0200)]
avfilter/vf_noise: use per component rand_shift
This allows using different shifts per plane
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Thu, 16 Oct 2014 12:28:47 +0000 (14:28 +0200)]
avfilter/vf_noise: move shift calculation to filter_frame()
This makes the temporal noise case deterministic with threads
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Thu, 16 Oct 2014 11:23:39 +0000 (13:23 +0200)]
avfilter/vf_noise: fix high resolution support
Fixes Ticket4017
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Thu, 16 Oct 2014 10:38:59 +0000 (12:38 +0200)]
Merge commit '
979932378ae3fbf452e312eb759cc7ce175f78de '
* commit '
979932378ae3fbf452e312eb759cc7ce175f78de ':
ismindex: use tfhd default duration if no sample duration
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Thu, 16 Oct 2014 10:28:00 +0000 (12:28 +0200)]
Carl Eugen Hoyos [Thu, 16 Oct 2014 10:01:26 +0000 (12:01 +0200)]
Fix initialisers in dct-test.c.
Silences a warning when running fate on unusual platforms:
libavcodec/dct-test.c:101:21: warning: missing braces around initializer [-Wmissing-braces]
libavcodec/dct-test.c:101:21: warning: (near initialization for 'fdct_tab_arch[0]') [-Wmissing-braces]
libavcodec/dct-test.c:102:21: warning: missing braces around initializer [-Wmissing-braces]
libavcodec/dct-test.c:102:21: warning: (near initialization for 'idct_tab_arch[0]') [-Wmissing-braces]
Mika Raento [Thu, 16 Oct 2014 05:55:17 +0000 (08:55 +0300)]
ismindex: use tfhd default duration if no sample duration
Signed-off-by: Martin Storsjö <martin@martin.st>
Michael Lynch [Tue, 14 Oct 2014 20:30:39 +0000 (16:30 -0400)]
rtsp: Check a memory allocation
CC: libav-stable@libav.org
Signed-off-by: Martin Storsjö <martin@martin.st>
Di Wu [Wed, 15 Oct 2014 08:24:21 +0000 (16:24 +0800)]
mpegts: add the judgement if a new program is created successfully
Add the judement after create a new program to avoid segment fault.
Signed-off-by: Di Wu <di1028.wu@samsung.com>
Reviewed-by: Marton Balint <cus@passwd.hu>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Wed, 15 Oct 2014 23:53:43 +0000 (01:53 +0200)]
avformat/util: Simplify av_guess_frame_rate() by using AVCodecContext.framerate
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Wed, 15 Oct 2014 23:48:41 +0000 (01:48 +0200)]
avformat/utils: Try to correct the codec_framerate in ff_compute_frame_duration() for the encoding case
No testcase where this makes a difference is known
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Wed, 15 Oct 2014 22:29:14 +0000 (00:29 +0200)]
avformat/oggparsedirac: use AVCodecContext.framerate
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Wed, 15 Oct 2014 22:13:45 +0000 (00:13 +0200)]
avcodec/avcodec: more verbose documentation for time_base
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Wed, 15 Oct 2014 22:10:38 +0000 (00:10 +0200)]
avcodec/avcodec: fix non doxy comment
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Wed, 15 Oct 2014 22:02:50 +0000 (00:02 +0200)]
Merge commit '
79dd756e143a54efc25d64e90505f0dca6cbc4ec '
* commit '
79dd756e143a54efc25d64e90505f0dca6cbc4ec ':
rtmpproto: Fix a typo
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Wed, 15 Oct 2014 21:23:49 +0000 (23:23 +0200)]
Merge commit '
ced7238cd01cc2199acf9225305628641a27c1d7 '
* commit '
ced7238cd01cc2199acf9225305628641a27c1d7 ':
rtpdec_hevc: Use av_realloc instead of av_malloc+memcpy
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Wed, 15 Oct 2014 20:03:02 +0000 (22:03 +0200)]
Merge commit '
752e71e74f50e7a6f9a19edb8e775b2ea2fb94d8 '
* commit '
752e71e74f50e7a6f9a19edb8e775b2ea2fb94d8 ':
rtpdec_hevc: Rename a variable for clarity
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Wed, 15 Oct 2014 19:39:50 +0000 (21:39 +0200)]
Merge commit '
74b02377980321934e33969c84733ace7e9f4eeb '
* commit '
74b02377980321934e33969c84733ace7e9f4eeb ':
mov: Correctly check the color transfer characteristics range
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Wed, 15 Oct 2014 19:22:06 +0000 (21:22 +0200)]
Merge commit '
1ac5a29b2e5ddeae068deb9d6e0e803a91941d4d '
* commit '
1ac5a29b2e5ddeae068deb9d6e0e803a91941d4d ':
imc: fix order of operations in coefficients read
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Mon, 13 Oct 2014 11:35:33 +0000 (13:35 +0200)]
avformat/mov: auodetect "use_mfra_for"
Reviewed-by: Mika Raento <mikie@iki.fi>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Yu Xiaolei [Wed, 15 Oct 2014 05:33:39 +0000 (13:33 +0800)]
build: mov_muxer requires ac3_parser
Reviewed-by: Benoit Fouet <benoit.fouet@free.fr>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Lynch [Tue, 14 Oct 2014 20:30:39 +0000 (16:30 -0400)]
avformat/rtsp: check memory allocation
Reviewed-by: Reimar Döffinger <Reimar.Doeffinger@gmx.de>
Commit message by: Benoit Fouet <benoit.fouet@free.fr>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Martin Storsjö [Wed, 15 Oct 2014 10:41:33 +0000 (13:41 +0300)]
rtmpproto: Fix a typo
Signed-off-by: Martin Storsjö <martin@martin.st>
Martin Storsjö [Wed, 15 Oct 2014 13:21:27 +0000 (16:21 +0300)]
rtpdec_hevc: Use av_realloc instead of av_malloc+memcpy
Signed-off-by: Martin Storsjö <martin@martin.st>
Martin Storsjö [Wed, 15 Oct 2014 13:14:28 +0000 (16:14 +0300)]
rtpdec_hevc: Rename a variable for clarity
Signed-off-by: Martin Storsjö <martin@martin.st>
Lou Logan [Thu, 2 Oct 2014 23:05:08 +0000 (15:05 -0800)]
doc/encoders: add basic libx265 documentation
Fixes ticket #3944.
Signed-off-by: Lou Logan <lou@lrcd.com>
Clément Bœsch [Sat, 11 Oct 2014 16:37:43 +0000 (18:37 +0200)]
avcodec/ass: add FFmpeg signature
Clément Bœsch [Sat, 11 Oct 2014 18:14:37 +0000 (20:14 +0200)]
avformat/assdec: typo fix
Clément Bœsch [Sat, 11 Oct 2014 18:16:43 +0000 (20:16 +0200)]
avcodec/ass_split: realign after addition of new fields
Clément Bœsch [Sat, 11 Oct 2014 14:12:51 +0000 (16:12 +0200)]
avcodec/ass_split: assume default order when "Format:" line is not found
Fixes the decoding of the ASS stream in a mkv from a fansub release from
Coalgirls.
Clément Bœsch [Sat, 11 Oct 2014 14:10:51 +0000 (16:10 +0200)]
avcodec/ass_split: extend recognized fields in ASS splitter
This simplifies the logic for the fix in the next commit.
Clément Bœsch [Sat, 11 Oct 2014 12:31:23 +0000 (14:31 +0200)]
avcodec/ass: output missing fields in AVSubtitles and output files
Fixes Ticket #3207
Clément Bœsch [Sat, 11 Oct 2014 10:57:37 +0000 (12:57 +0200)]
avformat/assenc: support remuxing old V4 ASS form (SSA)
Clément Bœsch [Sat, 11 Oct 2014 12:05:49 +0000 (14:05 +0200)]
fate: fix some subtitles tests dependencies
Clément Bœsch [Sat, 11 Oct 2014 17:17:33 +0000 (19:17 +0200)]
fate: add rawdiff and use it for subtitles
We want subtitles tests to match exactly line endings and trailing
characters.
Clément Bœsch [Sat, 11 Oct 2014 11:55:55 +0000 (13:55 +0200)]
fate: make subtitles tests output to stdout instead of md5
This makes tracking subtitles changes simpler.
Lou Logan [Tue, 14 Oct 2014 00:41:00 +0000 (16:41 -0800)]
doc/filters: update link to OpenCV docs
Signed-off-by: Lou Logan <lou@lrcd.com>
Michael Niedermayer [Wed, 15 Oct 2014 17:11:45 +0000 (19:11 +0200)]
Merge commit '
e5cfc8fdad901c9487fe896421972852f38bcf5 '
* commit '
e5cfc8fdad901c9487fe896421972852f38bcf5 ':
sdp: Provide out of bound parameter sets for HEVC if extradata is set
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Wed, 15 Oct 2014 17:04:17 +0000 (19:04 +0200)]
Merge commit '
9b7f932ee568cadfc0f556a061fcc00cb63f9780 '
* commit '
9b7f932ee568cadfc0f556a061fcc00cb63f9780 ':
rtpdec_hevc: Parse out of band vps/sps/pps/sei from fmtp lines
Merged-by: Michael Niedermayer <michaelni@gmx.at>
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>
Vittorio Giovara [Mon, 13 Oct 2014 12:34:24 +0000 (13:34 +0100)]
mov: Correctly check the color transfer characteristics range
Reported-by: Ruoyu <liangry@ucweb.com>
Vittorio Giovara [Mon, 13 Oct 2014 14:42:28 +0000 (15:42 +0100)]
imc: fix order of operations in coefficients read
Reported-by: Ruoyu <liangry@ucweb.com>
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>
Martin Storsjö [Fri, 3 Oct 2014 20:25:37 +0000 (23:25 +0300)]
sdp: Provide out of bound parameter sets for HEVC if extradata is set
Signed-off-by: Martin Storsjö <martin@martin.st>
Martin Storsjö [Fri, 3 Oct 2014 18:40:13 +0000 (21:40 +0300)]
rtpdec_hevc: Parse out of band vps/sps/pps/sei from fmtp lines
These are assembled into extradata in the order vps/sps/pps/sei.
Signed-off-by: Martin Storsjö <martin@martin.st>
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>