OSDN Git Service
Timo Rothenpieler [Sat, 23 Apr 2016 16:55:51 +0000 (18:55 +0200)]
configure: Don't require nonfree for nvenc
As the nvEncodeApi.h header is now MIT licensed, this can be dropped.
The loaded CUDA and NVENC libraries are part of the nvidia driver, and
thus count as system libraries.
Andreas Weis [Wed, 27 Apr 2016 06:15:18 +0000 (08:15 +0200)]
avutil/log: added test case for av_log_format_line2
Signed-off-by: Andreas Weis <github@ghulbus-inc.de>
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
Andreas Weis [Wed, 27 Apr 2016 06:15:17 +0000 (08:15 +0200)]
avutil/log: added av_log_format_line2 which returns buffer length
The new function behaves the same as av_log_format_line, but also forwards
the return value from the underlying snprintf call. This will allow
callers to accurately determine the size requirements for the line buffer.
Signed-off-by: Andreas Weis <github@ghulbus-inc.de>
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
Derek Buitenhuis [Wed, 27 Apr 2016 15:52:02 +0000 (16:52 +0100)]
Merge commit '
549fc77273636d0d02175362af5dcd60c79f7633'
* commit '
549fc77273636d0d02175362af5dcd60c79f7633':
svq3: move mb2br_xy to the SVQ3Context
Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
Derek Buitenhuis [Wed, 27 Apr 2016 15:49:10 +0000 (16:49 +0100)]
Merge commit '
99dde60391cade40ae026b9e385a5280be6b9882'
* commit '
99dde60391cade40ae026b9e385a5280be6b9882':
svq3: move {ref,mv}_cache to the SVQ3Context
Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
Derek Buitenhuis [Wed, 27 Apr 2016 15:48:20 +0000 (16:48 +0100)]
Merge commit '
89a13998a1b5074411dff5a461dce3837057b0b8'
* commit '
89a13998a1b5074411dff5a461dce3837057b0b8':
svq3: rip out the svq3-relevant parts of pred_motion() out of h264
Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
Derek Buitenhuis [Wed, 27 Apr 2016 15:47:52 +0000 (16:47 +0100)]
Merge commit '
8eecae77ff6e2923de57dd883421d24fd53ca61f'
* commit '
8eecae77ff6e2923de57dd883421d24fd53ca61f':
svq3: move edge_emu_buffer to the SVQ3Context
Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
Derek Buitenhuis [Wed, 27 Apr 2016 15:46:54 +0000 (16:46 +0100)]
Merge commit '
527bf5f7c6890664b0f1dccd42397f4d204659fe'
* commit '
527bf5f7c6890664b0f1dccd42397f4d204659fe':
svq3: move the pred mode variables to SVQ3Context
Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
Derek Buitenhuis [Wed, 27 Apr 2016 15:34:40 +0000 (16:34 +0100)]
Merge commit '
ecc31f6b086453ab9811dce2ae5ceb6a7c19e4ad'
* commit '
ecc31f6b086453ab9811dce2ae5ceb6a7c19e4ad':
h264: move ff_h264_check_intra[4x4]_pred_mode() to h264_parse
Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
Derek Buitenhuis [Wed, 27 Apr 2016 15:07:35 +0000 (16:07 +0100)]
Merge commit '
1877712c586df2261f2806f45388c77592b89d1e'
* commit '
1877712c586df2261f2806f45388c77592b89d1e':
svq3: move mb_{x,y,xy} to SVQ3Context
Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
Derek Buitenhuis [Wed, 27 Apr 2016 15:07:03 +0000 (16:07 +0100)]
Merge commit '
c2a4ca944d9029a3c162f8f3ddd317b83a7bd600'
* commit '
c2a4ca944d9029a3c162f8f3ddd317b83a7bd600':
svq3: eliminate write_back_intra_pred_mode() usage
Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
Derek Buitenhuis [Wed, 27 Apr 2016 15:06:29 +0000 (16:06 +0100)]
Merge commit '
c73fb9efb22c8d66d24de2716f7f9970f234c3c3'
* commit '
c73fb9efb22c8d66d24de2716f7f9970f234c3c3':
svq3: add all the required dsp contexts into SVQ3Context
Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
Derek Buitenhuis [Wed, 27 Apr 2016 14:49:40 +0000 (15:49 +0100)]
Merge commit '
15b0517da986b312fc2fcb364a92db328380b15b'
* commit '
15b0517da986b312fc2fcb364a92db328380b15b':
svq3: make the dsp functions static
Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
Derek Buitenhuis [Wed, 27 Apr 2016 14:48:00 +0000 (15:48 +0100)]
Merge commit '
9b30f8dd8fa5bef5f16904cb98745b4a58f8f776'
* commit '
9b30f8dd8fa5bef5f16904cb98745b4a58f8f776':
h264: remove the svq3-specific code
Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
Ivan Uskov [Tue, 26 Apr 2016 14:13:04 +0000 (10:13 -0400)]
qsv: Fix wrong ticks_per_frame for H.264
For H.264 stream ticks_per_frame should be 2, as per the docs.
Signed-off-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
Umair Khan [Wed, 27 Apr 2016 03:34:18 +0000 (09:04 +0530)]
avcodec/alsdec: Fix bitstream reading
Signed-off-by: Umair Khan <omerjerk@gmail.com>
Reviewed-by: Thilo Borgmann <thilo.borgmann@mail.de>
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
Paul B Mahol [Wed, 27 Apr 2016 07:08:45 +0000 (09:08 +0200)]
avcodec/shorten: make max frame size bigger if custom block size was used
Signed-off-by: Paul B Mahol <onemda@gmail.com>
Michael Niedermayer [Tue, 26 Apr 2016 23:33:25 +0000 (01:33 +0200)]
avcodec/h264: Only recover from reference pictures
Fixes spec compliance
Fixes Ticket5346
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
Michael Niedermayer [Tue, 26 Apr 2016 18:45:56 +0000 (20:45 +0200)]
avcodec/svq3: fix assert type (was av_assert2 in h264 from where this was copied)
Type was lost in
f8d1bb2f2ce9031940019e1cda4d30bc409ee349
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
Michael Niedermayer [Tue, 26 Apr 2016 17:17:19 +0000 (19:17 +0200)]
avcodec/ttaenc: Reallocate packet if its too small
Fixes assertion failure
Fixes Ticket5394
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
Rodger Combs [Tue, 19 Apr 2016 08:50:28 +0000 (03:50 -0500)]
lavc/audiotoolboxdec: move to new BSF API
Rodger Combs [Tue, 19 Apr 2016 08:44:17 +0000 (03:44 -0500)]
lavc/audiotoolboxdec: fix memory leak
Nicolas George [Mon, 25 Apr 2016 11:46:10 +0000 (13:46 +0200)]
lavf/concatdec: clear extradata when inserting h264_mp4toannexb bsf.
Fix remuxing H.264-in-MP4 to Matroska, possibly others.
Nicolas George [Sun, 24 Apr 2016 12:01:18 +0000 (14:01 +0200)]
lavf/concatdec: remove unrelated change during codecpar merge.
Clearing the extradata is not related to the codecpar change,
and it breaks if auto_convert is disabled.
Fix trac ticket #5461.
Derek Buitenhuis [Tue, 26 Apr 2016 14:11:59 +0000 (15:11 +0100)]
Merge commit '
e42ca48a8bddc637a4013ab253598973f07e1a5c'
* commit '
e42ca48a8bddc637a4013ab253598973f07e1a5c':
svq3: rip out the mb decoding code shared with h264
Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
Derek Buitenhuis [Tue, 26 Apr 2016 14:04:29 +0000 (15:04 +0100)]
Merge commit '
e481458bc308ee838deaeacac51929514762e7a7'
* commit '
e481458bc308ee838deaeacac51929514762e7a7':
h264: factor out pred weight table parsing into a separate file
Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
Derek Buitenhuis [Tue, 26 Apr 2016 13:09:52 +0000 (14:09 +0100)]
Merge commit '
90ed6c5cf7f236bc9efb47c97b40358c666d1386'
* commit '
90ed6c5cf7f236bc9efb47c97b40358c666d1386':
h2645_parse: compute the actual data length, without trailing paddding
Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
Derek Buitenhuis [Tue, 26 Apr 2016 13:07:03 +0000 (14:07 +0100)]
Merge commit '
b667252a41fbf5a3f6ea8c67fdbc03db3d748977'
* commit '
b667252a41fbf5a3f6ea8c67fdbc03db3d748977':
h2645_parse: add support for parsing h264
Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
Derek Buitenhuis [Tue, 26 Apr 2016 13:04:03 +0000 (14:04 +0100)]
Merge commit '
52ec149fbee57b6ca817049c9706212a0774a32c'
* commit '
52ec149fbee57b6ca817049c9706212a0774a32c':
h2645_parse: change the AVCodecContext* parameter to void*
Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
Derek Buitenhuis [Tue, 26 Apr 2016 13:01:45 +0000 (14:01 +0100)]
Merge commit '
8229eff4b7a98ae5d85bb75f3bb072781b4a8ebe'
* commit '
8229eff4b7a98ae5d85bb75f3bb072781b4a8ebe':
h2645_parse: add a function for uninitializing the packet
Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
Derek Buitenhuis [Tue, 26 Apr 2016 12:38:45 +0000 (13:38 +0100)]
Merge commit '
fa936a307f5cddfc2664600157a8207ca8080af6'
* commit '
fa936a307f5cddfc2664600157a8207ca8080af6':
hevc_parse: rename into h2645_parse
Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
Derek Buitenhuis [Mon, 25 Apr 2016 19:03:23 +0000 (20:03 +0100)]
qsvenc_hevc: Fix usage of ff_hevc_extract_rbsp
Signed-off-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
Martin Vignali [Sat, 23 Apr 2016 11:44:39 +0000 (13:44 +0200)]
libavcodec/exr: move xsize and ysize to thread data
Fixes slice threading.
Signed-off-by: James Almer <jamrial@gmail.com>
Derek Buitenhuis [Mon, 25 Apr 2016 13:40:33 +0000 (14:40 +0100)]
lavc/hevc_parse: Don't take a HEVCContext
It's not even used anymore, and the checks are no longer
functionally important.
Signed-off-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
Michael Niedermayer [Mon, 25 Apr 2016 02:08:21 +0000 (04:08 +0200)]
avcodec/ac3dec: Reset SPX when switching from EAC3 to AC3
Fixes Ticket5319
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
Jan Ekström [Sun, 24 Apr 2016 14:30:56 +0000 (17:30 +0300)]
pgssubdec: fix subpicture output colorspace and range
Functionality used before didn't widen the values from limited to
full range. Additionally, now the decoder uses BT.709 where it
should be used according to the video resolution.
Default for not yet set colorimetry is BT.709 due to most observed
HDMV content being HD.
BT.709 coefficients were gathered from the first two parts of BT.709
to BT.2020 conversion guide in ARIB STD-B62 (Pt. 1, Chapter 6.2.2).
They were additionally confirmed by manually calculating values.
Fixes #4637
Derek Buitenhuis [Sun, 24 Apr 2016 11:51:34 +0000 (12:51 +0100)]
Merge commit '
cdb1665f70def544ddab3e3ed3763ef99c8b3873'
* commit '
cdb1665f70def544ddab3e3ed3763ef99c8b3873':
aarch64: Make transpose_4x4H do a regular transpose
Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
Derek Buitenhuis [Sun, 24 Apr 2016 11:48:39 +0000 (12:48 +0100)]
Merge commit '
edf54887e2935a30f9d9a46dd806802c3c867c0e'
This merge is a no-op.
* commit '
edf54887e2935a30f9d9a46dd806802c3c867c0e':
rtpdec_jpeg: fix low contrast image on low quality setting
Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
Derek Buitenhuis [Sun, 24 Apr 2016 11:36:23 +0000 (12:36 +0100)]
Merge commit '
159323897f545e7405fb9db234e0ba123e174376'
* commit '
159323897f545e7405fb9db234e0ba123e174376':
intrax8: Add a local BlockDSPContext and initialize it
Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
Derek Buitenhuis [Sun, 24 Apr 2016 11:34:58 +0000 (12:34 +0100)]
Merge commit '
1eaae7abb8f208fefb4e8b9e983e61b2499206a3'
* commit '
1eaae7abb8f208fefb4e8b9e983e61b2499206a3':
intrax8: Reference the current AVCodecContext
Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
Derek Buitenhuis [Sun, 24 Apr 2016 11:34:16 +0000 (12:34 +0100)]
Merge commit '
8072345e9f86d88fbc4a15c17cb03f1e4701c9a5'
* commit '
8072345e9f86d88fbc4a15c17cb03f1e4701c9a5':
intrax8: Keep a reference to the GetBitContext reader
Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
Derek Buitenhuis [Sun, 24 Apr 2016 11:33:07 +0000 (12:33 +0100)]
Merge commit '
65f14128c4bcf8fcd9d3ba1e20b7a22057c9cfb0'
* commit '
65f14128c4bcf8fcd9d3ba1e20b7a22057c9cfb0':
intrax8: Use a constant buffer instead of a ScratchpadContext
Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
Derek Buitenhuis [Sun, 24 Apr 2016 11:32:38 +0000 (12:32 +0100)]
Merge commit '
eaeba6f241e0de0e797be10f8fda967ef8489e64'
* commit '
eaeba6f241e0de0e797be10f8fda967ef8489e64':
intrax8: Pass the output frame to the decoding function
Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
Derek Buitenhuis [Sun, 24 Apr 2016 11:31:14 +0000 (12:31 +0100)]
Merge commit '
577393321c389ad2973bec6168a8045c94a9e099'
* commit '
577393321c389ad2973bec6168a8045c94a9e099':
intrax8: Carry over the loopfilter value in ff_intrax8_decode_picture
Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
Derek Buitenhuis [Sun, 24 Apr 2016 11:19:53 +0000 (12:19 +0100)]
Merge commit '
68127e1bf8037a6e0acd6401cc8c5da950e3fa0a'
* commit '
68127e1bf8037a6e0acd6401cc8c5da950e3fa0a':
intrax8: Keep a reference to the context idctdsp
Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
Derek Buitenhuis [Sun, 24 Apr 2016 11:16:16 +0000 (12:16 +0100)]
Merge commit '
65127450add50c3bca307edc0517d2e8382717a0'
* commit '
65127450add50c3bca307edc0517d2e8382717a0':
intrax8: Make x8_init_block_index not use mpegvideo fields
Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
Derek Buitenhuis [Sun, 24 Apr 2016 11:08:11 +0000 (12:08 +0100)]
Merge commit '
922b7e6d86e6197dfa5ebde602dd12cc66fb5f1f'
* commit '
922b7e6d86e6197dfa5ebde602dd12cc66fb5f1f':
intrax8: Use local destination buffers
Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
Derek Buitenhuis [Sun, 24 Apr 2016 10:54:53 +0000 (11:54 +0100)]
Merge commit '
a7da517f6a5c472f46f67dd33bb6b95ccc919923'
* commit '
a7da517f6a5c472f46f67dd33bb6b95ccc919923':
h264data: Move all data tables from a header to a .c file
Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
Derek Buitenhuis [Sun, 24 Apr 2016 10:47:15 +0000 (11:47 +0100)]
Merge commit '
f4d581cda3897f66c1dda7586b93f86a591dbbef'
* commit '
f4d581cda3897f66c1dda7586b93f86a591dbbef':
lavc: Deduplicate zigzag_scan table
Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
Michael Niedermayer [Sun, 24 Apr 2016 10:30:20 +0000 (12:30 +0200)]
avfilter/vf_drawtext: Check return code of load_glyph()
Fixes segfault
Fixes Ticket5347
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
Derek Buitenhuis [Sun, 24 Apr 2016 10:36:44 +0000 (11:36 +0100)]
Merge commit '
02cd8bb9cb4381c50f42a9284098cc8a33d397db'
* commit '
02cd8bb9cb4381c50f42a9284098cc8a33d397db':
h264: Clean up #includes
Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
Michael Niedermayer [Sun, 24 Apr 2016 10:07:37 +0000 (12:07 +0200)]
avformat/mux: Check that deinit is set before calling it
Fixes null pointer dereference
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
Michael Niedermayer [Sun, 10 Apr 2016 17:29:55 +0000 (19:29 +0200)]
avformat/mpegts: Skip over broken 0x80 headers
This fixes demuxing of
01c56b0dc1.ts
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
Michael Niedermayer [Sun, 10 Apr 2016 17:23:40 +0000 (19:23 +0200)]
avformat/mpegts: factor duplicate seek back code into mpegts_resync
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
Michael Niedermayer [Sat, 23 Apr 2016 15:23:59 +0000 (17:23 +0200)]
avcodec/utils: Assert that the number of consumed bytes in avcodec_decode_audio4() is <= the input size
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
Carl Eugen Hoyos [Sat, 23 Apr 2016 09:11:32 +0000 (11:11 +0200)]
lavf/isom: Support Perian tag NELL for nellymoser.
Reported by forum user turas35.
Michael Niedermayer [Sat, 23 Apr 2016 00:04:23 +0000 (02:04 +0200)]
avutil/aes: Remove duplicate include
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
Jan Sebechlebsky [Wed, 20 Apr 2016 21:48:38 +0000 (00:48 +0300)]
avformat/tee: Handling slave failure in tee muxer
Adds per slave option 'onfail' to the tee muxer allowing an output to
fail, so other slave outputs can continue.
Reviewed-by: Nicolas George <george@nsup.org>
Signed-off-by: Jan Sebechlebsky <sebechlebskyjan@gmail.com>
Signed-off-by: Marton Balint <cus@passwd.hu>
Jan Sebechlebsky [Wed, 20 Apr 2016 17:21:03 +0000 (20:21 +0300)]
avformat/tee: Fix leaks in tee muxer when open_slave fails
In open_slave failure can happen before bsfs array is initialized,
close_slave must check that bsfs is not NULL before accessing
tee_slave->bsfs[i] element.
Slave muxer expects write_trailer to be called if it's
write_header suceeded (so resources allocated in write_header
are freed). Therefore if failure happens after successfull
write_header call, we must ensure that write_trailer of
that particular slave is called.
Some cleanups are made by Marton Balint.
Reviewed-by: Nicolas George <george@nsup.org>
Signed-off-by: Jan Sebechlebsky <sebechlebskyjan@gmail.com>
Signed-off-by: Marton Balint <cus@passwd.hu>
wm4 [Fri, 22 Apr 2016 17:29:48 +0000 (19:29 +0200)]
avcodec/utils: fix minor memory leaks on avcodec_open2() failure
Derek Buitenhuis [Fri, 22 Apr 2016 16:21:52 +0000 (17:21 +0100)]
Merge commit '
704a39769719d2e1ae3f13bfc562b51c9cd002d7'
* commit '
704a39769719d2e1ae3f13bfc562b51c9cd002d7':
rtmpdh: add an stdio.h include
Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
Derek Buitenhuis [Fri, 22 Apr 2016 16:20:43 +0000 (17:20 +0100)]
Merge commit '
e3dfef8e3c85a64dbe6388117303f5819fa3c6a2'
This commit is a no-op. Ivan Uskov is going to port it for us.
* commit '
e3dfef8e3c85a64dbe6388117303f5819fa3c6a2':
qsvdec_h2645: switch to the new BSF API
Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
Lou Logan [Fri, 22 Apr 2016 06:06:05 +0000 (22:06 -0800)]
doc/APIchanges: Fix bitsream typo
Signed-off-by: Lou Logan <lou@lrcd.com>
Michael Niedermayer [Fri, 22 Apr 2016 02:30:30 +0000 (04:30 +0200)]
doc/APIchanges: Fix bistream typo
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
Michael Niedermayer [Thu, 21 Apr 2016 14:49:00 +0000 (16:49 +0200)]
avfilter: Add AV_OPT_FLAG_FILTERING_PARAM to where it was missing
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
Paul B Mahol [Wed, 6 Apr 2016 09:02:39 +0000 (11:02 +0200)]
avcodec: add TrueMotion 2.0 Real Time decoder
Signed-off-by: Paul B Mahol <onemda@gmail.com>
Derek Buitenhuis [Thu, 21 Apr 2016 15:52:03 +0000 (16:52 +0100)]
Merge commit '
a638e9184d63e57e67901f34afe919fd56fd3ac4'
* commit '
a638e9184d63e57e67901f34afe919fd56fd3ac4':
vf_fade: make sure the slice end is always in the frame
Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
Derek Buitenhuis [Thu, 21 Apr 2016 15:40:10 +0000 (16:40 +0100)]
Merge commit '
3b08d9d932eef09403074d5af31e10d8011e840b'
* commit '
3b08d9d932eef09403074d5af31e10d8011e840b':
testprogs: K&R formatting cosmetics
Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
Derek Buitenhuis [Thu, 21 Apr 2016 15:04:10 +0000 (16:04 +0100)]
Merge commit '
439929859ae0eb9542d3bb8a0c856bd5a1d1ec48'
* commit '
439929859ae0eb9542d3bb8a0c856bd5a1d1ec48':
testprogs: Clean up #includes
Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
Derek Buitenhuis [Thu, 21 Apr 2016 15:03:43 +0000 (16:03 +0100)]
Merge commit '
3dfbf32b95ae69a9b15cd4912bc1c68fa16b4093'
* commit '
3dfbf32b95ae69a9b15cd4912bc1c68fa16b4093':
build: Drop redundant removal of compiled object files
Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
Derek Buitenhuis [Thu, 21 Apr 2016 15:02:26 +0000 (16:02 +0100)]
Merge commit '
b298b36fc008ad94a24929fe770c8189d96bcac4'
* commit '
b298b36fc008ad94a24929fe770c8189d96bcac4':
fate: Only run SRTP test if SRTP code is enabled
Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
Derek Buitenhuis [Thu, 21 Apr 2016 15:01:47 +0000 (16:01 +0100)]
Merge commit '
3ee2ec5ec1e39a438f89302d949c93a1b5d365a2'
* commit '
3ee2ec5ec1e39a438f89302d949c93a1b5d365a2':
unix: Use rw_timeout for setting the connect timeout
Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
Derek Buitenhuis [Thu, 21 Apr 2016 15:01:26 +0000 (16:01 +0100)]
Merge commit '
136c3438bbdb56a5d2f1f0f486f180641dc6dda0'
This commit is a no-op.
* commit '
136c3438bbdb56a5d2f1f0f486f180641dc6dda0':
tcp: Use rw_timeout for setting the connect/listen timeouts
Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
Derek Buitenhuis [Thu, 21 Apr 2016 14:55:09 +0000 (15:55 +0100)]
Merge commit '
fab8156b2f30666adabe227b3d7712fd193873b1'
* commit '
fab8156b2f30666adabe227b3d7712fd193873b1':
avio: Copy URLContext generic options into child URLContexts
Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
Derek Buitenhuis [Thu, 21 Apr 2016 14:21:09 +0000 (15:21 +0100)]
libnut: Pass stream to ff_parse_specific_params
This function bo longer takes an AVCodecContext.
Fixes ticket #5430.
Signed-off-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
wm4 [Tue, 22 Mar 2016 18:09:57 +0000 (19:09 +0100)]
lavf: use new decode API
From Libav commit
8bc4accc37ab047d2fd85d672c577b39dfc918e1, with
additional code for decoding subtitles (not present in Libav).
Signed-off-by: Anton Khirnov <anton@khirnov.net>
wm4 [Tue, 22 Mar 2016 18:09:53 +0000 (19:09 +0100)]
lavc: introduce a new decoding/encoding API with decoupled input/output
Until now, the decoding API was restricted to outputting 0 or 1 frames
per input packet. It also enforces a somewhat rigid dataflow in general.
This new API seeks to relax these restrictions by decoupling input and
output. Instead of doing a single call on each decode step, which may
consume the packet and may produce output, the new API requires the user
to send input first, and then ask for output.
For now, there are no codecs supporting this API. The API can work with
codecs using the old API, and most code added here is to make them
interoperate. The reverse is not possible, although for audio it might.
From Libav commit
05f66706d182eb0c36af54d72614bf4c33e957a9.
Signed-off-by: Anton Khirnov <anton@khirnov.net>
Michael Niedermayer [Thu, 21 Apr 2016 11:35:22 +0000 (13:35 +0200)]
avformat/utils: Remove use of caps_internal as it is not public API
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
Michael Niedermayer [Wed, 20 Apr 2016 17:19:25 +0000 (19:19 +0200)]
avcodec: Add avpriv_codec_get_cap_skip_frame_fill_param()
With this the use of the caps_internal from libavformat can be avoided
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
Michael Niedermayer [Wed, 20 Apr 2016 20:38:26 +0000 (22:38 +0200)]
avcodec/avpacket: Fix off by 5 error
Fixes out of array read
Fixes: mozilla bug
1266129
Found-by: Tyson Smith
Tested-by: Tyson Smith
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
Paul B Mahol [Wed, 20 Apr 2016 20:45:05 +0000 (22:45 +0200)]
avcodec/takdec: add code that got somehow lost in process of REing
Signed-off-by: Paul B Mahol <onemda@gmail.com>
Anton Mitrofanov [Thu, 7 Apr 2016 10:09:03 +0000 (13:09 +0300)]
x86inc: Enable AVX emulation in additional cases
Allows emulation to work when dst is equal to src2 as long as the
instruction is commutative, e.g. `addps m0, m1, m0`.
Anton Mitrofanov [Thu, 7 Apr 2016 09:48:29 +0000 (12:48 +0300)]
x86inc: Improve handling of %ifid with multi-token parameters
The yasm/nasm preprocessor only checks the first token, which means that
parameters such as `dword [rax]` are treated as identifiers, which is
generally not what we want.
Anton Mitrofanov [Mon, 28 Mar 2016 15:35:38 +0000 (18:35 +0300)]
x86inc: Fix AVX emulation of some instructions
Henrik Gramner [Fri, 4 Mar 2016 16:51:41 +0000 (17:51 +0100)]
x86inc: Fix AVX emulation of scalar float instructions
Those instructions are not commutative since they only change the first
element in the vector and leave the rest unmodified.
Tobias Rapp [Thu, 7 Apr 2016 12:39:33 +0000 (14:39 +0200)]
fate: add readvitc filter test
Signed-off-by: Tobias Rapp <t.rapp@noa-archive.com>
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
Michael Niedermayer [Fri, 15 Apr 2016 00:30:12 +0000 (02:30 +0200)]
fate: Add test for ticket 1833 (Ogg/Vorbis Chapters)
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
Petru Rares Sincraian [Tue, 19 Apr 2016 15:39:47 +0000 (17:39 +0200)]
fate: Add test for mts2 (mss4) codec
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
Derek Buitenhuis [Tue, 19 Apr 2016 18:17:50 +0000 (19:17 +0100)]
Merge commit '
564b4591bbe223bdc5f36a1131eaef103f23f5d0'
* commit '
564b4591bbe223bdc5f36a1131eaef103f23f5d0':
opt: Add av_opt_copy()
Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
Derek Buitenhuis [Tue, 19 Apr 2016 13:43:23 +0000 (14:43 +0100)]
Merge commit '
8833f1508b7b6afc3172a8017934a7a54428c686'
This commit is a no-op.
* commit '
8833f1508b7b6afc3172a8017934a7a54428c686':
opt: Add const to av_opt_next
Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
Derek Buitenhuis [Tue, 19 Apr 2016 13:41:19 +0000 (14:41 +0100)]
Merge commit '
933dec0e29ec4d2cb83474279a6c52d62fdb7310'
* commit '
933dec0e29ec4d2cb83474279a6c52d62fdb7310':
file: Add an option for following a file that is being written
Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
Paul B Mahol [Mon, 18 Apr 2016 21:27:08 +0000 (23:27 +0200)]
avcodec/tak_parser: fix parsing of streams with bunch of small frames at end
Signed-off-by: Paul B Mahol <onemda@gmail.com>
Petru Rares Sincraian [Mon, 18 Apr 2016 16:52:51 +0000 (18:52 +0200)]
fate: Add test for 012v codec
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
Petru Rares Sincraian [Mon, 18 Apr 2016 15:03:01 +0000 (17:03 +0200)]
fate: Add test for mss1 codec
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
Derek Buitenhuis [Mon, 18 Apr 2016 14:47:05 +0000 (15:47 +0100)]
Merge commit '
ccea588f831906084b8c8235222920e6984beb72'
* commit '
ccea588f831906084b8c8235222920e6984beb72':
avio: Add an option 'rw_timeout'
Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
Derek Buitenhuis [Mon, 18 Apr 2016 14:35:12 +0000 (15:35 +0100)]
Merge commit '
d44f3e4059506a182f59218b1e967d42b01e097c'
* commit '
d44f3e4059506a182f59218b1e967d42b01e097c':
avio: Apply avoptions on the URLContext itself as well
Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
Derek Buitenhuis [Mon, 18 Apr 2016 14:33:38 +0000 (15:33 +0100)]
Merge commit '
8a02a8031ef4f98faf5647f0e01a8922247bf748'
* commit '
8a02a8031ef4f98faf5647f0e01a8922247bf748':
lavfi: add an NVIDIA NPP-based scaling filter
Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
Derek Buitenhuis [Mon, 18 Apr 2016 14:22:24 +0000 (15:22 +0100)]
Merge commit '
98114d70e48caf871b0fe9b8e5bf8ebd989b845d'
* commit '
98114d70e48caf871b0fe9b8e5bf8ebd989b845d':
lavf: VAAPI scale filter
Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
Derek Buitenhuis [Mon, 18 Apr 2016 14:13:28 +0000 (15:13 +0100)]
Merge commit '
8bc4accc37ab047d2fd85d672c577b39dfc918e1'
This commit is a no-op. wm4 is working to get these into ffmpeg
proper, with ffmpeg versions of the patches.
* commit '
8bc4accc37ab047d2fd85d672c577b39dfc918e1':
lavf: use new decode API
avconv: use new encode API
avconv: use new decode API
lavc: introduce a new decoding/encoding API with decoupled input/output
Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
Derek Buitenhuis [Mon, 18 Apr 2016 14:00:13 +0000 (15:00 +0100)]
Merge commit '
0d2fcdb1c5c9e844c232e5429130727121990d0e'
These commits are no-ops. Not going to merge these since our opt
tests are more complex, and have several blocks with different
options.
* commit '
0d2fcdb1c5c9e844c232e5429130727121990d0e':
opt-test: Merge struct declaration and initialization
opt-test: Move some variable declarations to avoid block braces
Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>