ffmpeg.git
3 years agoavcodec/shorten: make max frame size bigger if custom block size was used
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>
3 years agoavcodec/h264: Only recover from reference pictures
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>
3 years agoavcodec/svq3: fix assert type (was av_assert2 in h264 from where this was copied)
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>
3 years agoavcodec/ttaenc: Reallocate packet if its too small
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>
3 years agolavc/audiotoolboxdec: move to new BSF API
Rodger Combs [Tue, 19 Apr 2016 08:50:28 +0000 (03:50 -0500)]
lavc/audiotoolboxdec: move to new BSF API

3 years agolavc/audiotoolboxdec: fix memory leak
Rodger Combs [Tue, 19 Apr 2016 08:44:17 +0000 (03:44 -0500)]
lavc/audiotoolboxdec: fix memory leak

3 years agolavf/concatdec: clear extradata when inserting h264_mp4toannexb bsf.
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.

3 years agolavf/concatdec: remove unrelated change during codecpar merge.
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.

3 years agoMerge commit 'e42ca48a8bddc637a4013ab253598973f07e1a5c'
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>
3 years agoMerge commit 'e481458bc308ee838deaeacac51929514762e7a7'
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>
3 years agoMerge commit '90ed6c5cf7f236bc9efb47c97b40358c666d1386'
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>
3 years agoMerge commit 'b667252a41fbf5a3f6ea8c67fdbc03db3d748977'
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>
3 years agoMerge commit '52ec149fbee57b6ca817049c9706212a0774a32c'
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>
3 years agoMerge commit '8229eff4b7a98ae5d85bb75f3bb072781b4a8ebe'
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>
3 years agoMerge commit 'fa936a307f5cddfc2664600157a8207ca8080af6'
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>
3 years agoqsvenc_hevc: Fix usage of ff_hevc_extract_rbsp
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>
3 years agolibavcodec/exr: move xsize and ysize to thread data
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>
3 years agolavc/hevc_parse: Don't take a HEVCContext
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>
3 years agoavcodec/ac3dec: Reset SPX when switching from EAC3 to AC3
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>
3 years agopgssubdec: fix subpicture output colorspace and range
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

3 years agoMerge commit 'cdb1665f70def544ddab3e3ed3763ef99c8b3873'
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>
3 years agoMerge commit 'edf54887e2935a30f9d9a46dd806802c3c867c0e'
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>
3 years agoMerge commit '159323897f545e7405fb9db234e0ba123e174376'
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>
3 years agoMerge commit '1eaae7abb8f208fefb4e8b9e983e61b2499206a3'
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>
3 years agoMerge commit '8072345e9f86d88fbc4a15c17cb03f1e4701c9a5'
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>
3 years agoMerge commit '65f14128c4bcf8fcd9d3ba1e20b7a22057c9cfb0'
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>
3 years agoMerge commit 'eaeba6f241e0de0e797be10f8fda967ef8489e64'
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>
3 years agoMerge commit '577393321c389ad2973bec6168a8045c94a9e099'
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>
3 years agoMerge commit '68127e1bf8037a6e0acd6401cc8c5da950e3fa0a'
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>
3 years agoMerge commit '65127450add50c3bca307edc0517d2e8382717a0'
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>
3 years agoMerge commit '922b7e6d86e6197dfa5ebde602dd12cc66fb5f1f'
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>
3 years agoMerge commit 'a7da517f6a5c472f46f67dd33bb6b95ccc919923'
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>
3 years agoMerge commit 'f4d581cda3897f66c1dda7586b93f86a591dbbef'
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>
3 years agoavfilter/vf_drawtext: Check return code of load_glyph()
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>
3 years agoMerge commit '02cd8bb9cb4381c50f42a9284098cc8a33d397db'
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>
3 years agoavformat/mux: Check that deinit is set before calling it
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>
3 years agoavformat/mpegts: Skip over broken 0x80 headers
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>
3 years agoavformat/mpegts: factor duplicate seek back code into mpegts_resync
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>
3 years agoavcodec/utils: Assert that the number of consumed bytes in avcodec_decode_audio4...
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>
3 years agolavf/isom: Support Perian tag NELL for nellymoser.
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.

3 years agoavutil/aes: Remove duplicate include
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>
3 years agoavformat/tee: Handling slave failure in tee muxer
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>
3 years agoavformat/tee: Fix leaks in tee muxer when open_slave fails
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>
3 years agoavcodec/utils: fix minor memory leaks on avcodec_open2() failure
wm4 [Fri, 22 Apr 2016 17:29:48 +0000 (19:29 +0200)]
avcodec/utils: fix minor memory leaks on avcodec_open2() failure

3 years agoMerge commit '704a39769719d2e1ae3f13bfc562b51c9cd002d7'
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>
3 years agoMerge commit 'e3dfef8e3c85a64dbe6388117303f5819fa3c6a2'
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>
3 years agodoc/APIchanges: Fix bitsream typo
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>
3 years agodoc/APIchanges: Fix bistream typo
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>
3 years agoavfilter: Add AV_OPT_FLAG_FILTERING_PARAM to where it was missing
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>
3 years agoavcodec: add TrueMotion 2.0 Real Time decoder
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>
3 years agoMerge commit 'a638e9184d63e57e67901f34afe919fd56fd3ac4'
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>
3 years agoMerge commit '3b08d9d932eef09403074d5af31e10d8011e840b'
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>
3 years agoMerge commit '439929859ae0eb9542d3bb8a0c856bd5a1d1ec48'
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>
3 years agoMerge commit '3dfbf32b95ae69a9b15cd4912bc1c68fa16b4093'
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>
3 years agoMerge commit 'b298b36fc008ad94a24929fe770c8189d96bcac4'
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>
3 years agoMerge commit '3ee2ec5ec1e39a438f89302d949c93a1b5d365a2'
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>
3 years agoMerge commit '136c3438bbdb56a5d2f1f0f486f180641dc6dda0'
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>
3 years agoMerge commit 'fab8156b2f30666adabe227b3d7712fd193873b1'
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>
3 years agolibnut: Pass stream to ff_parse_specific_params
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>
3 years agolavf: use new decode API
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>
3 years agolavc: introduce a new decoding/encoding API with decoupled input/output
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>
3 years agoavformat/utils: Remove use of caps_internal as it is not public API
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>
3 years agoavcodec: Add avpriv_codec_get_cap_skip_frame_fill_param()
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>
3 years agoavcodec/avpacket: Fix off by 5 error
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>
3 years agoavcodec/takdec: add code that got somehow lost in process of REing
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>
3 years agox86inc: Enable AVX emulation in additional cases
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`.

3 years agox86inc: Improve handling of %ifid with multi-token parameters
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.

3 years agox86inc: Fix AVX emulation of some instructions
Anton Mitrofanov [Mon, 28 Mar 2016 15:35:38 +0000 (18:35 +0300)]
x86inc: Fix AVX emulation of some instructions

3 years agox86inc: Fix AVX emulation of scalar float 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.

3 years agofate: add readvitc filter test
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>
3 years agofate: Add test for ticket 1833 (Ogg/Vorbis Chapters)
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>
3 years agofate: Add test for mts2 (mss4) codec
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>
3 years agoMerge commit '564b4591bbe223bdc5f36a1131eaef103f23f5d0'
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>
3 years agoMerge commit '8833f1508b7b6afc3172a8017934a7a54428c686'
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>
3 years agoMerge commit '933dec0e29ec4d2cb83474279a6c52d62fdb7310'
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>
3 years agoavcodec/tak_parser: fix parsing of streams with bunch of small frames at end
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>
3 years agofate: Add test for 012v codec
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>
3 years agofate: Add test for mss1 codec
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>
3 years agoMerge commit 'ccea588f831906084b8c8235222920e6984beb72'
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>
3 years agoMerge commit 'd44f3e4059506a182f59218b1e967d42b01e097c'
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>
3 years agoMerge commit '8a02a8031ef4f98faf5647f0e01a8922247bf748'
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>
3 years agoMerge commit '98114d70e48caf871b0fe9b8e5bf8ebd989b845d'
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>
3 years agoMerge commit '8bc4accc37ab047d2fd85d672c577b39dfc918e1'
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>
3 years agoMerge commit '0d2fcdb1c5c9e844c232e5429130727121990d0e'
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>
3 years agoavcodec/dump_extradata_bsf: Add back 'k' and 'e' options
Michael Niedermayer [Mon, 18 Apr 2016 00:39:15 +0000 (02:39 +0200)]
avcodec/dump_extradata_bsf: Add back 'k' and 'e' options

broken since af9cac1be1750ecc0e12c6788a3aeed1f1a778be

Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
3 years agoavcodec/remove_extradata_bsf: Add back 'k' and 'e' options
Michael Niedermayer [Mon, 18 Apr 2016 00:31:55 +0000 (02:31 +0200)]
avcodec/remove_extradata_bsf: Add back 'k' and 'e' options

broken since af9cac1be1750ecc0e12c6788a3aeed1f1a778be

Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
3 years agoavcodec/bitstream_filter: Fix initializing options from the argument string
Michael Niedermayer [Sun, 17 Apr 2016 22:06:13 +0000 (00:06 +0200)]
avcodec/bitstream_filter: Fix initializing options from the argument string

Fixes ffmpeg ... -vbsf noise=234 ...

Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
3 years agoavcodec/intrax8: Remove duplicated chunk from ba5bcf96124a4933eef170dfe7955809d8d54a64
Michael Niedermayer [Sun, 17 Apr 2016 22:42:41 +0000 (00:42 +0200)]
avcodec/intrax8: Remove duplicated chunk from ba5bcf96124a4933eef170dfe7955809d8d54a64

Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
3 years agolavc/fic: Cosmetics, fix a typo.
Carl Eugen Hoyos [Sun, 17 Apr 2016 22:18:54 +0000 (00:18 +0200)]
lavc/fic: Cosmetics, fix a typo.

Found by Moritz Barsnick

3 years agolavfi/perspective: Add basic timeline editing.
Thilo Borgmann [Sun, 10 Apr 2016 16:18:17 +0000 (18:18 +0200)]
lavfi/perspective: Add basic timeline editing.

Add number of input and output frames to possible variables.
Add option eval to reevaluate coordinate expressions during
initialization or for every frame.

3 years agoMerge commit 'a84713e70d06238100cb0f867ad6031c272054b0'
Derek Buitenhuis [Sun, 17 Apr 2016 18:46:01 +0000 (19:46 +0100)]
Merge commit 'a84713e70d06238100cb0f867ad6031c272054b0'

This commit is a no-op.

* commit 'a84713e70d06238100cb0f867ad6031c272054b0':
  parseutils-test: Move some variable declarations to avoid block braces

Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
3 years agolavc/webp: Print a warning for unsupported chunks.
Carl Eugen Hoyos [Sun, 17 Apr 2016 18:42:10 +0000 (20:42 +0200)]
lavc/webp: Print a warning for unsupported chunks.

3 years agoMerge commit '52385410b7de012c2562fb5ba8f07a4e1112c4e7'
Derek Buitenhuis [Sun, 17 Apr 2016 18:40:53 +0000 (19:40 +0100)]
Merge commit '52385410b7de012c2562fb5ba8f07a4e1112c4e7'

* commit '52385410b7de012c2562fb5ba8f07a4e1112c4e7':
  des-test: Move a variable declaration to avoid an ifdef

Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
3 years agoMerge commit '65a802401c6cc136576bb2e613c0577cbf622aa8'
Derek Buitenhuis [Sun, 17 Apr 2016 18:39:57 +0000 (19:39 +0100)]
Merge commit '65a802401c6cc136576bb2e613c0577cbf622aa8'

* commit '65a802401c6cc136576bb2e613c0577cbf622aa8':
  build: Add component for the SRTP common code

Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
3 years agoMerge commit '30e9ef21cea09fa5e880e979c9f5b39edccbb6f4'
Derek Buitenhuis [Sun, 17 Apr 2016 18:37:54 +0000 (19:37 +0100)]
Merge commit '30e9ef21cea09fa5e880e979c9f5b39edccbb6f4'

* commit '30e9ef21cea09fa5e880e979c9f5b39edccbb6f4':
  timefilter-test: Only compile timefilter-test if JACK is enabled

Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
3 years agoMerge commit '48362ceadeb2eb5286ae94ef7f9542d990ff7ec7'
Derek Buitenhuis [Sun, 17 Apr 2016 18:36:59 +0000 (19:36 +0100)]
Merge commit '48362ceadeb2eb5286ae94ef7f9542d990ff7ec7'

* commit '48362ceadeb2eb5286ae94ef7f9542d990ff7ec7':
  doc: Update paths to match new examples location

Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
3 years agoMerge commit '8dead2aaca4aa8b84b77b05745755afb56b7d37a'
Derek Buitenhuis [Sun, 17 Apr 2016 18:35:03 +0000 (19:35 +0100)]
Merge commit '8dead2aaca4aa8b84b77b05745755afb56b7d37a'

* commit '8dead2aaca4aa8b84b77b05745755afb56b7d37a':
  Move const qualifier before type name

Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
3 years agoMerge commit 'd909f43b5c773a73c8d526638744547ba4aa8c59'
Derek Buitenhuis [Sun, 17 Apr 2016 18:32:26 +0000 (19:32 +0100)]
Merge commit 'd909f43b5c773a73c8d526638744547ba4aa8c59'

* commit 'd909f43b5c773a73c8d526638744547ba4aa8c59':
  vc1dec: wmv2dec: Validate ff_intrax8_common_init return value

Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
3 years agoMerge commit '0372e73f917e72c40b09270f771046fc142be4a7'
Derek Buitenhuis [Sun, 17 Apr 2016 18:31:32 +0000 (19:31 +0100)]
Merge commit '0372e73f917e72c40b09270f771046fc142be4a7'

* commit '0372e73f917e72c40b09270f771046fc142be4a7':
  intrax8: Check and propagate errors from ff_intrax8_common_init

Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
3 years agoMerge commit 'ad8aa8e6c648b61f01b9f106f27b9d4f3d094345'
Derek Buitenhuis [Sun, 17 Apr 2016 18:30:01 +0000 (19:30 +0100)]
Merge commit 'ad8aa8e6c648b61f01b9f106f27b9d4f3d094345'

* commit 'ad8aa8e6c648b61f01b9f106f27b9d4f3d094345':
  intrax8: Move documentation from implementation to header file

Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>