]>
git.sesse.net Git - ffmpeg/log
Derek Buitenhuis [Wed, 24 Feb 2016 14:28:20 +0000 (14:28 +0000)]
Merge commit '
c51b2c79a7ba084253e892c56dd49ee97115c7de '
This commit is a no-op. We already have such functionality.
* commit '
c51b2c79a7ba084253e892c56dd49ee97115c7de ':
Allow linking to CUDA dynamically instead of dlopen()ing it at runtime
Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
Michael Niedermayer [Wed, 24 Feb 2016 00:44:27 +0000 (01:44 +0100)]
avcodec/mpeg12dec: Fix missing slice handling without padding
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
Kieran Kunhya [Mon, 8 Feb 2016 21:40:10 +0000 (21:40 +0000)]
Add GBRAP12 pixel format
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
Ganesh Ajjanagadde [Tue, 23 Feb 2016 04:21:58 +0000 (23:21 -0500)]
lavc/utvideodec: prevent possible signed overflow
Doing slice_end - slice_start is unsafe and can lead to undefined behavior
until slice_end has been properly sanitized.
Reviewed-by: Ronald S. Bultje <rsbultje@gmail.com>
Signed-off-by: Ganesh Ajjanagadde <gajjanag@gmail.com>
Michael Niedermayer [Tue, 23 Feb 2016 22:48:11 +0000 (23:48 +0100)]
swscale/utils: Fix chrSrcHSubSample for GBRAP16
Fixes part of Ticket5264
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
Michael Niedermayer [Tue, 23 Feb 2016 22:14:03 +0000 (23:14 +0100)]
swscale/input: Fix GBRAP16 input
Fixes part of Ticket5264
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
Stefano Sabatini [Wed, 18 Nov 2015 18:23:03 +0000 (19:23 +0100)]
lavc/lavf: transmit stream_id information for mpegts KLV data packets
This allows to copy information related to the stream ID from the demuxer
to the muxer, thus allowing for example to retain information related to
synchronous and asynchronous KLV data packets. This information is used
in the muxer when remuxing to distinguish the two kind of packets (if the
information is lacking, data packets are considered synchronous).
The fate reference changes are due to the use of
av_packet_merge_side_data(), which increases the size of the output
packet size, since side data is merged into the packet data.
Mats Peterson [Tue, 23 Feb 2016 16:17:12 +0000 (17:17 +0100)]
lavf/riffenc: Handle AV_PIX_FMT_MONOBLACK
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
Muhammad Faiz [Mon, 22 Feb 2016 15:17:50 +0000 (22:17 +0700)]
avfilter/avf_showcqt: use lrint
Reviewed-by: Michael Niedermayer <michael@niedermayer.cc>
Signed-off-by: Muhammad Faiz <mfcc64@gmail.com>
Carl Eugen Hoyos [Tue, 23 Feb 2016 14:50:28 +0000 (15:50 +0100)]
postproc: fix unaligned access
Based on
59074310 by Andreas Cadhalpun.
Fixes ticket #5259.
James Zern [Sat, 20 Feb 2016 19:19:47 +0000 (11:19 -0800)]
libvpxenc: quiet unused-variable warning
with older versions of libvpx
since:
432be63 lavc/libvpx: Fix support for RGB colorspace.
Reviewed-by: James Almer <jamrial@gmail.com>
Signed-off-by: James Zern <jzern@google.com>
James Almer [Mon, 22 Feb 2016 22:59:07 +0000 (19:59 -0300)]
x86/dcadec: add ff_lfe_fir1_float_{sse3,avx}
Reviewed-by: Christophe Gisquet <christophe.gisquet@gmail.com>
Signed-off-by: James Almer <jamrial@gmail.com>
Carl Eugen Hoyos [Mon, 22 Feb 2016 23:21:49 +0000 (00:21 +0100)]
lavfi/nnedi: Fix a compilation warning.
Silences the following warning:
libavfilter/vf_nnedi.c:611:15: warning: assignment discards ‘const’ qualifier from pointer target type
Carl Eugen Hoyos [Mon, 22 Feb 2016 23:19:11 +0000 (00:19 +0100)]
lavfi/nnedi: Fix a memleak.
Muhammad Faiz [Mon, 22 Feb 2016 18:05:08 +0000 (01:05 +0700)]
avfilter/avf_showcqt: remove unneeded headers
Muhammad Faiz [Tue, 16 Feb 2016 18:02:22 +0000 (01:02 +0700)]
avfilter: add firequalizer filter
Reviewed-by: Paul B Mahol <onemda@gmail.com>
Signed-off-by: Muhammad Faiz <mfcc64@gmail.com>
Rostislav Pehlivanov [Mon, 22 Feb 2016 17:18:15 +0000 (17:18 +0000)]
vc2enc: set quantization ceiling to 50
The reference encoder limits it to 64, but testing revealed that there
is absolutely no difference for indices above 50 in amount of zeroed
coefficients.
Signed-off-by: Rostislav Pehlivanov <atomnuker@gmail.com>
Paul B Mahol [Mon, 22 Feb 2016 16:57:16 +0000 (17:57 +0100)]
avfilter/vf_waveform: add 12bit depth support
Signed-off-by: Paul B Mahol <onemda@gmail.com>
James Almer [Sat, 20 Feb 2016 19:02:30 +0000 (16:02 -0300)]
checkasm: bench each vf_blend mode once
Also bench a smaller buffer. This drastically reduces --bench runtime
and reports smaller, more readable numbers.
Reviewed-by: Michael Niedermayer <michael@niedermayer.cc>
Signed-off-by: James Almer <jamrial@gmail.com>
Xiaolei Yu [Mon, 22 Feb 2016 11:50:13 +0000 (19:50 +0800)]
swscale/arm: re-enable neon rgbx to nv12 routines
Commit '
842b8f4ba2e79b9c004a67f6fdb3d5c5d05805d3 ' fixed clang/iphone
build but failed on some versions of cygwin. It has now been verified
to work on both platforms.
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
Michael Niedermayer [Mon, 22 Feb 2016 02:31:34 +0000 (03:31 +0100)]
avutil/pixdesc: Make get_color_type() aware of CIE XYZ formats
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
Josh de Kock [Sun, 21 Feb 2016 22:42:32 +0000 (22:42 +0000)]
configure&avdevice/jack: Fixed issue #43 JACK indev support on OSX
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
Mats Peterson [Sun, 21 Feb 2016 05:50:41 +0000 (06:50 +0100)]
lavc/rawdec: Align AV_PIX_FMT_RGB24 correctly
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
Marton Balint [Fri, 5 Feb 2016 22:46:25 +0000 (23:46 +0100)]
avformat/asfenc: write group_mutual_exclusion_objects for audio on multiple languages
Improves streaming compatibility with Windows Media Services. Also tested for
compatilbility in Windows Media Player, Windows Media ASF Viewer and VLC.
This version of the patch only writes exclusion among audio streams, therefore
choosing a subtitle language should be possible independently of audio language.
Signed-off-by: Marton Balint <cus@passwd.hu>
Zalewa [Sat, 13 Feb 2016 14:30:15 +0000 (15:30 +0100)]
ffserver: NoVideo and NoAudio flags weren't cleared between streams.
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
Paul B Mahol [Sun, 21 Feb 2016 20:34:32 +0000 (21:34 +0100)]
doc/filters: fix nnedi typos
Signed-off-by: Paul B Mahol <onemda@gmail.com>
Michael Niedermayer [Sun, 21 Feb 2016 18:41:56 +0000 (19:41 +0100)]
avformat/mpjpegdec: add AVFMT_NOTIMESTAMPS
there are no timestamps being set, thus do not attempt to collect any
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
Alex Agranovsky [Sun, 14 Feb 2016 04:15:20 +0000 (23:15 -0500)]
lavf/mpjpeg: probe should not depend on Content-Length MIME header being present
Signed-off-by: Alex Agranovsky <alex@sighthound.com>
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
James Almer [Sun, 21 Feb 2016 00:44:53 +0000 (21:44 -0300)]
avcodec/webp: move exif_metadata outside of WebPContext
Reviewed-by: Michael Niedermayer <michael@niedermayer.cc>
Signed-off-by: James Almer <jamrial@gmail.com>
Rostislav Pehlivanov [Sun, 21 Feb 2016 16:39:54 +0000 (16:39 +0000)]
vc2enc: use LAVC_INDENT instead of FFMPEG_VERSION for encoder comment
Prevents from having to recompile vc2enc on every single commit.
Signed-off-by: Rostislav Pehlivanov <atomnuker@gmail.com>
Michael Niedermayer [Sun, 21 Feb 2016 03:21:34 +0000 (04:21 +0100)]
avformat/riffenc: Also check codec tag before setting raw_pal_avi
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
Oliver Collyer [Sat, 20 Feb 2016 07:33:49 +0000 (09:33 +0200)]
ffserver&ffm: Fixed issues preventing ffserver write_index and files_size from being set correctly which was breaking ffserver streaming.
I discovered that ffserver streaming was broken (it seems like it has been since 20th November) and I opened a ticket for this (https://trac.ffmpeg.org/ticket/5250 <https://trac.ffmpeg.org/ticket/5250>).
I spent yesterday learning git bisect (with the kind help of cehoyos) to painstakingly track down the cause. This was made more difficult due to the presence of a segfault in ffserver during the period where the bug was introduced so I first had to identify when and how that was fixed and then retrospectively apply that fix again for each step of the second git bisect to find the actual bug.
Anyway, the fruits of my labour are the innocent looking patch below to correct a couple of typos and define a valid range for two variables.
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
Mats Peterson [Sat, 20 Feb 2016 11:59:38 +0000 (12:59 +0100)]
lavc/rawdec: Remove monowhite switching code for 1 bpp AVI without a palette
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
Michael Niedermayer [Sun, 21 Feb 2016 01:56:11 +0000 (02:56 +0100)]
avformat/avienc: Fix assertion failure with 256 palette entries
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
Mats Peterson [Sat, 20 Feb 2016 11:57:50 +0000 (12:57 +0100)]
lavf/avienc: Add palette after BITMAPINFOHEADER
lavf/riffenc: Write space for palette
tests/ref/vsynth: Update 1 bpp files for pal8
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
Reto Kromer [Sat, 20 Feb 2016 19:04:08 +0000 (20:04 +0100)]
avienc: Remove unused variable 'ret'
Reviewed-by: Michael Niedermayer <michael@niedermayer.cc>
Signed-off-by: Timothy Gu <timothygu99@gmail.com>
Rostislav Pehlivanov [Fri, 19 Feb 2016 14:56:22 +0000 (14:56 +0000)]
vc2enc: add support for Haar wavelet transforms
This commit adds support for the (simple, allowed in the spec, but
inferior in quality) Haar wavelet transforms.
Signed-off-by: Rostislav Pehlivanov <atomnuker@gmail.com>
Mark Harris [Tue, 16 Feb 2016 07:52:13 +0000 (23:52 -0800)]
avformat/icodec: Fix crash probing fuzzed file
Avoid invalid memory read/crash when frame offset >= 0xfffffff8.
Base64-encoded example: AAABADAwMDAwMAAAMAAwMDAw/P///w==
(The previous commit verifies that p->buf_size >= 22.)
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
Mark Harris [Tue, 16 Feb 2016 07:52:12 +0000 (23:52 -0800)]
avformat/icodec: ico probe with unknown data
Fix cases where unknown data (data beyond p->buf_size) could produce a
higher ico probe score than if the unknown data was known and valid.
For example:
Header: OK, 2 frames
Frame 0: Unknown (offset points beyond end of probe buffer)
Frame 1: Invalid
Previously this example had a score of 25, even though the score would
be 1 if the unknown frame was known to be valid or 0 if it was known
to be invalid. For this example the score is now 1.
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
Carl Eugen Hoyos [Fri, 19 Feb 2016 23:29:55 +0000 (00:29 +0100)]
configure: Fix webm_dash_manifest demuxer standalone compilation.
Marton Balint [Wed, 17 Feb 2016 19:17:00 +0000 (20:17 +0100)]
ffmpeg: init input streams before opening encoders
Codec options of streams detected during avformat_find_stream_info are not set
therefore without this patch we initialize the encoders with decoder info
based on decoders without options.
This cause problems for probed DVB teletext streams where
avctx->subtitle_header depend on the txt_format setting.
Reviewed-by: Michael Niedermayer <michael@niedermayer.cc>
Signed-off-by: Marton Balint <cus@passwd.hu>
Marton Balint [Tue, 16 Feb 2016 02:10:43 +0000 (03:10 +0100)]
avcodec/libzvbi-teletextdec: use common functions for matching data_unit_id and data_identifier
Signed-off-by: Marton Balint <cus@passwd.hu>
Marton Balint [Tue, 16 Feb 2016 02:05:10 +0000 (03:05 +0100)]
avformat/dvbtxt: add raw demuxer for dvb teletext probing
Signed-off-by: Marton Balint <cus@passwd.hu>
Carl Eugen Hoyos [Fri, 19 Feb 2016 20:11:56 +0000 (21:11 +0100)]
lavc/libvpx: Reindent after last commit.
Carl Eugen Hoyos [Fri, 19 Feb 2016 20:06:26 +0000 (21:06 +0100)]
lavc/libvpx: Fix support for RGB colorspace.
Reported and tested by Nicolas George.
Fixes ticket #5249.
Carl Eugen Hoyos [Fri, 19 Feb 2016 20:02:42 +0000 (21:02 +0100)]
lavc/libvpx: Fix high-bitdepth pix_fmts on big endian.
James Almer [Thu, 18 Feb 2016 23:23:49 +0000 (20:23 -0300)]
checkasm: fix dependencies for vf_blend tests
They will now compile if avcodec is disabled
Reviewed-by: Paul B Mahol <onemda@gmail.com>
Signed-off-by: James Almer <jamrial@gmail.com>
Michael Niedermayer [Thu, 18 Feb 2016 19:57:32 +0000 (20:57 +0100)]
avformat/avienc: Store pal8 palette
This can be made more efficient, but first and the main goal of this change is to
store it at all
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
Paul B Mahol [Thu, 18 Feb 2016 22:47:39 +0000 (23:47 +0100)]
avcodec/cdxl: add support for raw videos with chunky format
Signed-off-by: Paul B Mahol <onemda@gmail.com>
Michael Niedermayer [Fri, 19 Feb 2016 00:31:16 +0000 (01:31 +0100)]
avcodec/h264: Execute error concealment before marking the frame as done.
Fixes race condition causing artifacts
Fixes Ticket4122
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
Michael Niedermayer [Wed, 17 Feb 2016 12:37:41 +0000 (13:37 +0100)]
avformat/avienc: Use avi_write_packet_internal() to store raw rgb in a more spec compliant way
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
Michael Niedermayer [Wed, 17 Feb 2016 22:34:54 +0000 (23:34 +0100)]
Revert 4 commits to configure which broke dependency handling
Revert "configure: Don't enable examples when --disable-everything is used"
reverted as the problematic commit will be reverted too
This reverts commit
02dfa64c088c87367c298a3f648454204656734f .
Revert "Merge commit '
a2bb771a3cded8a05137c0effb34f61a2bc78e22 '"
This reverts commit
e8ebcb0034c5d4e5df8ff407a5c28d8c53823236 , reversing
changes made to
3bff005be8ea213c23160ee0ac286634a80a10e1 .
Revert "Merge commit '
21c750f240b9d0c41a258d1adee2d9f75ff378b6 '"
This reverts commit
470bfab470893d45328f4e6e25d60b89c9af1abe , reversing
changes made to
f97ee815cf25580cbb9d6bed304d9c22895f7074 .
Revert "Revert "configure: Revert recent changes to disable-everything""
This reverts commit
f97ee815cf25580cbb9d6bed304d9c22895f7074 .
Reviewed-by: Hendrik Leppkes <h.leppkes@gmail.com>
Immediate commit suggested by BBB
Moritz Barsnick [Thu, 18 Feb 2016 13:47:10 +0000 (14:47 +0100)]
lavf/options_table: mark use_wallclock_as_timestamps as boolean
It is only used in a boolean context. Also clarify its documentation.
Signed-off-by: Moritz Barsnick <barsnick@gmx.net>
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
Michael Niedermayer [Wed, 17 Feb 2016 12:37:13 +0000 (13:37 +0100)]
avformat/avienc: Split avi_write_packet_internal() out
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
Michael Niedermayer [Wed, 17 Feb 2016 13:02:19 +0000 (14:02 +0100)]
avformat: add ff_reshuffle_raw_rgb()
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
Thomas Mundt [Mon, 8 Feb 2016 00:00:42 +0000 (01:00 +0100)]
avfilter: add BobWeaver deinterlacing filter
Paul B Mahol [Thu, 11 Feb 2016 21:05:54 +0000 (22:05 +0100)]
avfilter: add loop filters
Signed-off-by: Paul B Mahol <onemda@gmail.com>
Michael Niedermayer [Thu, 18 Feb 2016 00:07:33 +0000 (01:07 +0100)]
ffmpeg: Check best_effort_timestamp after rescale
Fixes integer overflow
Fixes: Ticket5126
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
Aman Gupta [Mon, 15 Feb 2016 02:11:54 +0000 (18:11 -0800)]
lavc/ccaption_dec: implement special and extended character sets
character sets implemented as defined in https://en.wikipedia.org/wiki/EIA-608#Characters
Aman Gupta [Mon, 15 Feb 2016 02:11:53 +0000 (18:11 -0800)]
lavc/ccaption_dec: do not ignore repeated character commands
control codes in a cc stream can be repeated, and must be ignored.
however, repeated characters must not be ignored. the code attempted to
wipe prev_cmd in handle_char to allow repeated characters to be
processed, but prev_cmd would previously get reset _after_ handle_char()
i also moved the prev_cmd reset out from handle_char() so it can be
re-used for special character sets, which _must_ be ignored when
repeated.
Mark Reid [Tue, 16 Feb 2016 06:01:28 +0000 (22:01 -0800)]
tests/fate: added dnxhr parser regression test
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
Michael Niedermayer [Wed, 17 Feb 2016 17:22:55 +0000 (18:22 +0100)]
avutil/hwcontext: Remove duplicate ;
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
Derek Buitenhuis [Wed, 17 Feb 2016 19:20:49 +0000 (19:20 +0000)]
configure: Don't enable examples when --disable-everything is used
This resotres old behavior.
Signed-off-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
Paul B Mahol [Mon, 15 Feb 2016 16:07:33 +0000 (17:07 +0100)]
avfilter/drawutils: >8 bit support
Signed-off-by: Paul B Mahol <onemda@gmail.com>
Derek Buitenhuis [Wed, 17 Feb 2016 16:46:44 +0000 (16:46 +0000)]
Merge commit '
bd49be885e9ad6bae599c54473ba2fa2957eb140 '
* commit '
bd49be885e9ad6bae599c54473ba2fa2957eb140 ':
avconv_vdpau: use the hwcontext API to simplify code
Tested-by: wm4
Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
Derek Buitenhuis [Wed, 17 Feb 2016 16:16:34 +0000 (16:16 +0000)]
Merge commit '
a001ce31bc2bcf875a39b5fb22dae49120293b42 '
* commit '
a001ce31bc2bcf875a39b5fb22dae49120293b42 ':
hwcontext: add a VDPAU implementation
Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
Derek Buitenhuis [Wed, 17 Feb 2016 16:10:53 +0000 (16:10 +0000)]
Merge commit '
89923e418b494e337683442ab896d754bc07341a '
* commit '
89923e418b494e337683442ab896d754bc07341a ':
lavu: add a framework for handling hwaccel frames
Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
Derek Buitenhuis [Wed, 17 Feb 2016 16:07:16 +0000 (16:07 +0000)]
Merge commit '
721a4efc0545548a241080b53ab480e34f366240 '
* commit '
721a4efc0545548a241080b53ab480e34f366240 ':
buffer: add support for pools using caller data in allocation
Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
Derek Buitenhuis [Wed, 17 Feb 2016 15:42:12 +0000 (15:42 +0000)]
Merge commit '
c084d6d2cfb570b10d8784eb20cc696dfb7c5605 '
* commit '
c084d6d2cfb570b10d8784eb20cc696dfb7c5605 ':
buffersrc: default SAR to 0 (unknown) rather than 1
Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
Derek Buitenhuis [Wed, 17 Feb 2016 15:39:27 +0000 (15:39 +0000)]
Merge commit '
a2bb771a3cded8a05137c0effb34f61a2bc78e22 '
* commit '
a2bb771a3cded8a05137c0effb34f61a2bc78e22 ':
configure: Restore the --enable-everything behaviour
Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
Derek Buitenhuis [Wed, 17 Feb 2016 15:30:44 +0000 (15:30 +0000)]
Merge commit '
5e1beec944dacd6b4ed7d710125dd508c41ca969 '
* commit '
5e1beec944dacd6b4ed7d710125dd508c41ca969 ':
configure: Print which libraries will be built
Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
Derek Buitenhuis [Wed, 17 Feb 2016 15:27:50 +0000 (15:27 +0000)]
Merge commit '
21c750f240b9d0c41a258d1adee2d9f75ff378b6 '
* commit '
21c750f240b9d0c41a258d1adee2d9f75ff378b6 ':
configure: Use `require` for the non-component options
Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
Derek Buitenhuis [Wed, 17 Feb 2016 15:27:11 +0000 (15:27 +0000)]
Revert "configure: Revert recent changes to disable-everything"
Following merges make it work as before.
This reverts commit
cefad29df93ab88ebab584e6ee151d5339d9329f .
Signed-off-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
Johan Ström [Wed, 3 Feb 2016 21:20:07 +0000 (22:20 +0100)]
hlsenc: add use_localtime_mkdir option to automatically create time-based directory
Use with -use_localtime, and set -hls_segment_filename to a path which
contains a subdirectory i.e. /some/path/%Y%m%d/%Y%m%dT%H%M%S-%s.ts
This will mkdir the %Y%m%d-part of the path if it does not already
exist.
In addition, each filename in the playlist output will be prefixed with
this subdirectory (if playlist and segment shares the same base path).
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
Muhammad Faiz [Tue, 16 Feb 2016 00:03:37 +0000 (07:03 +0700)]
avfilter/avf_showcqt: improve pts handling
correct output pts based on input pts
make seeking possible
output frame one by one on eof
tested with showinfo filter
Suggested-by: Paul B Mahol <onemda@gmail.com>
Reviewed-by: Paul B Mahol <onemda@gmail.com>
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
Michael Niedermayer [Wed, 17 Feb 2016 02:53:38 +0000 (03:53 +0100)]
avcodec/eatqi: print error on mb decode failure
Reviewed-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
Paul B Mahol [Wed, 17 Feb 2016 08:42:46 +0000 (09:42 +0100)]
avfilter/vf_drawbox: reindent
Signed-off-by: Paul B Mahol <onemda@gmail.com>
Paul B Mahol [Mon, 15 Feb 2016 10:38:22 +0000 (11:38 +0100)]
avfilter/vf_drawbox: add alpha pixel formats support
Signed-off-by: Paul B Mahol <onemda@gmail.com>
Michael Niedermayer [Tue, 16 Feb 2016 23:14:56 +0000 (00:14 +0100)]
swscale/x86/output: Fix yuv2planeX_16* with unaligned destination
Reviewed-by: BBB
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
Michael Niedermayer [Wed, 17 Feb 2016 03:15:29 +0000 (04:15 +0100)]
swscale/x86/output: Move code into yuv2planeX_mainloop
Reviewed-by: BBB
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
Michael Niedermayer [Tue, 16 Feb 2016 20:36:29 +0000 (21:36 +0100)]
avcodec/mpeg12: Remove duplicate block_last_index setting code
Based on
7c25ffe070c286874a8c3513f7504b90e1626b0c and
58dd885f9ae7feee002773253e345e11e7142739
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
Michael Niedermayer [Tue, 16 Feb 2016 20:26:54 +0000 (21:26 +0100)]
avcodec/mpeg12: Fix error return
Also remove a tab
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
Michael Niedermayer [Tue, 16 Feb 2016 16:54:55 +0000 (17:54 +0100)]
avformat/hls: fix potential integer overflow
This is not a regression
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
Derek Buitenhuis [Tue, 16 Feb 2016 20:09:56 +0000 (20:09 +0000)]
mov: Fix leftover merge conflict cruft
Signed-off-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
Derek Buitenhuis [Tue, 16 Feb 2016 20:07:08 +0000 (20:07 +0000)]
Merge commit '
5eb562831b3a9bea8026c413ef1338e06450d005 '
This commit is a no-op.
* commit '
5eb562831b3a9bea8026c413ef1338e06450d005 ':
mov: Use the correct type for size
Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
Derek Buitenhuis [Tue, 16 Feb 2016 20:05:28 +0000 (20:05 +0000)]
Merge commit '
8d34a2f803c9ca9433b5a51bacbbe352e8d327e2 '
* commit '
8d34a2f803c9ca9433b5a51bacbbe352e8d327e2 ':
vdpau: Support for VDPAU accelerated HEVC decoding
Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
Derek Buitenhuis [Tue, 16 Feb 2016 19:53:50 +0000 (19:53 +0000)]
Merge commit '
8958c5c64d05453204642b55a7b8b44c93023b17 '
This commit is a no-op.
* commit '
8958c5c64d05453204642b55a7b8b44c93023b17 ':
hevc: Track long and short term RPS size for VDPAU
Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
Derek Buitenhuis [Tue, 16 Feb 2016 19:52:17 +0000 (19:52 +0000)]
Merge commit '
8c399bd5cefd572eceb448981fcb6d4dbca35d27 '
This commit is a no-op.
* commit '
8c399bd5cefd572eceb448981fcb6d4dbca35d27 ':
dxva2_hevc: properly signal the num_delta_pocs from the SPS RPS
Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
Derek Buitenhuis [Tue, 16 Feb 2016 19:51:02 +0000 (19:51 +0000)]
Merge commit '
e579d8b29cdb9b42c50a0fde277dfb047c1466ad '
* commit '
e579d8b29cdb9b42c50a0fde277dfb047c1466ad ':
lavf: Dump the cpb side data information
Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
Derek Buitenhuis [Tue, 16 Feb 2016 19:49:51 +0000 (19:49 +0000)]
Merge commit '
d005ccc630e42daab8ec2afecf972d1551a9401a '
This commit is a no-op. Ours should be superior.
* commit '
d005ccc630e42daab8ec2afecf972d1551a9401a ':
nvenc: rename a misnamed function
nvenc: merge input and output surface structs
nvenc: factor out the pixel format list
Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
Derek Buitenhuis [Tue, 16 Feb 2016 19:48:39 +0000 (19:48 +0000)]
Merge commit '
fb25d99b0a5e21fb8cc184c7a9d3736387778266 '
This commit is a no-op.
* commit '
fb25d99b0a5e21fb8cc184c7a9d3736387778266 ':
buffersrc: do not discard the error from ff_filter_frame()
Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
Derek Buitenhuis [Tue, 16 Feb 2016 19:40:06 +0000 (19:40 +0000)]
Merge commit '
f7d77b9a5dd42bf0f5dffecf590466b4c4239437 '
* commit '
f7d77b9a5dd42bf0f5dffecf590466b4c4239437 ':
eatqi: Remove MpegEncContext dependency
Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
Derek Buitenhuis [Tue, 16 Feb 2016 19:19:23 +0000 (19:19 +0000)]
Merge commit '
7c25ffe070c286874a8c3513f7504b90e1626b0c '
* commit '
7c25ffe070c286874a8c3513f7504b90e1626b0c ':
mpeg1: Make intra-block decoding independent of MpegEncContext
Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
Derek Buitenhuis [Tue, 16 Feb 2016 19:05:26 +0000 (19:05 +0000)]
Merge commit '
249827f736db4c94dfcb24a3883aa4c04f9b119b '
* commit '
249827f736db4c94dfcb24a3883aa4c04f9b119b ':
mpeg12dec: Refactor mpeg1_decode_block_intra()
Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
Derek Buitenhuis [Tue, 16 Feb 2016 18:57:41 +0000 (18:57 +0000)]
Merge commit '
cdbaa436042ba59c3b2bd7e9652e9a14136fd604 '
* commit '
cdbaa436042ba59c3b2bd7e9652e9a14136fd604 ':
mpeg12dec: Always close reader on error
Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
Paul B Mahol [Tue, 16 Feb 2016 17:14:55 +0000 (18:14 +0100)]
avfilter/f_streamselect: check if map is available
Signed-off-by: Paul B Mahol <onemda@gmail.com>
Derek Buitenhuis [Tue, 16 Feb 2016 18:11:05 +0000 (18:11 +0000)]
Merge commit '
7a00653be6b13131ce1b2cdeca696429f57caaf8 '
* commit '
7a00653be6b13131ce1b2cdeca696429f57caaf8 ':
tiny_psnr: Support large files
Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
Lou Logan [Tue, 16 Feb 2016 17:49:49 +0000 (08:49 -0900)]
doc/filters: remove redundant example
Newer example in blend from
f80b475 is faster and simpler.
Signed-off-by: Lou Logan <lou@lrcd.com>
Derek Buitenhuis [Tue, 16 Feb 2016 17:48:30 +0000 (17:48 +0000)]
Merge commit '
99214d42a902c8392d7887c08fdc5dc1fc2475ae '
This commit is a no-op. FFmpeg already has this.
* commit '
99214d42a902c8392d7887c08fdc5dc1fc2475ae ':
dnxhd: Make the encoder message friendlier
Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
Derek Buitenhuis [Tue, 16 Feb 2016 17:44:33 +0000 (17:44 +0000)]
Merge commit '
34c9eba982c75196392a3b0b245dd34297c4511d '
* commit '
34c9eba982c75196392a3b0b245dd34297c4511d ':
configure: Refactor toolchain flag setting
Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>