ffmpeg.git
3 years agoffplay: Fix usage of private lavfi API
Timo Rothenpieler [Wed, 29 Jun 2016 09:15:39 +0000 (11:15 +0200)]
ffplay: Fix usage of private lavfi API

Reviewed-by: Michael Niedermayer <michael@niedermayer.cc>
3 years agoMerge commit '2940e196c5e439d9869f8c02a49a318d0847453c'
Clément Bœsch [Wed, 29 Jun 2016 10:03:47 +0000 (12:03 +0200)]
Merge commit '2940e196c5e439d9869f8c02a49a318d0847453c'

* commit '2940e196c5e439d9869f8c02a49a318d0847453c':
  vaapi_h265: cu_qp_delta should not be used in constant-QP mode

Merged-by: Clément Bœsch <clement@stupeflix.com>
3 years agoMerge commit '02fa1ad9266f9b1ea11565ac2f93f45853e351e8'
Clément Bœsch [Wed, 29 Jun 2016 10:03:40 +0000 (12:03 +0200)]
Merge commit '02fa1ad9266f9b1ea11565ac2f93f45853e351e8'

* commit '02fa1ad9266f9b1ea11565ac2f93f45853e351e8':
  vaapi_h264: Add source version identifier as unregistered SEI

Merged-by: Clément Bœsch <clement@stupeflix.com>
3 years agoMerge commit '48e2967cd50c2e1a2a539fd697d20ead2c5c4cc8'
Clément Bœsch [Wed, 29 Jun 2016 10:03:28 +0000 (12:03 +0200)]
Merge commit '48e2967cd50c2e1a2a539fd697d20ead2c5c4cc8'

* commit '48e2967cd50c2e1a2a539fd697d20ead2c5c4cc8':
  vaapi_h264: Add support for SEI messages

Merged-by: Clément Bœsch <clement@stupeflix.com>
3 years agoMerge commit '19d7667a81499d4357ec8e0851701e17c238e584'
Clément Bœsch [Wed, 29 Jun 2016 10:03:20 +0000 (12:03 +0200)]
Merge commit '19d7667a81499d4357ec8e0851701e17c238e584'

* commit '19d7667a81499d4357ec8e0851701e17c238e584':
  vaapi_encode: Add support for writing arbitrary additional packed headers

Merged-by: Clément Bœsch <clement@stupeflix.com>
3 years agoMerge commit '081961f819c0b16c7a860d7da7d39f1fd91bd2f0'
Clément Bœsch [Wed, 29 Jun 2016 10:03:06 +0000 (12:03 +0200)]
Merge commit '081961f819c0b16c7a860d7da7d39f1fd91bd2f0'

* commit '081961f819c0b16c7a860d7da7d39f1fd91bd2f0':
  vaapi_h264: Add support for VUI parameters

Merged-by: Clément Bœsch <clement@stupeflix.com>
3 years agoMerge commit '2e4a7bd553ec7c805b4a3b90733405a14ba69072'
Clément Bœsch [Wed, 29 Jun 2016 09:56:57 +0000 (11:56 +0200)]
Merge commit '2e4a7bd553ec7c805b4a3b90733405a14ba69072'

* commit '2e4a7bd553ec7c805b4a3b90733405a14ba69072':
  h264: drop unused H264Context.gb

Merged-by: Clément Bœsch <clement@stupeflix.com>
3 years agoMerge commit '4f81f8dba735c212efae077c4fec8ad4fe53b352'
Clément Bœsch [Wed, 29 Jun 2016 09:54:54 +0000 (11:54 +0200)]
Merge commit '4f81f8dba735c212efae077c4fec8ad4fe53b352'

* commit '4f81f8dba735c212efae077c4fec8ad4fe53b352':
  Drop unnecessary golomb.h #includes

Merged-by: Clément Bœsch <clement@stupeflix.com>
3 years agoMerge commit '197ae68e78784524a7ccf97a3c301092715305d3'
Clément Bœsch [Wed, 29 Jun 2016 09:52:34 +0000 (11:52 +0200)]
Merge commit '197ae68e78784524a7ccf97a3c301092715305d3'

* commit '197ae68e78784524a7ccf97a3c301092715305d3':
  Drop unnecessary unary.h #includes

Merged-by: Clément Bœsch <clement@stupeflix.com>
3 years agoMerge commit '6ac52f05a6fcadb84972c9557b28c67a416f866b'
Clément Bœsch [Wed, 29 Jun 2016 09:52:03 +0000 (11:52 +0200)]
Merge commit '6ac52f05a6fcadb84972c9557b28c67a416f866b'

* commit '6ac52f05a6fcadb84972c9557b28c67a416f866b':
  dvbsub_parser: Add missing mem.h #include

Merged-by: Clément Bœsch <clement@stupeflix.com>
3 years agoMerge commit '81f769fa129edc51c28285649c2df6da717e718f'
Clément Bœsch [Wed, 29 Jun 2016 09:48:53 +0000 (11:48 +0200)]
Merge commit '81f769fa129edc51c28285649c2df6da717e718f'

* commit '81f769fa129edc51c28285649c2df6da717e718f':
  gsm: Move requant_tab table to the gsm tables file

Merged-by: Clément Bœsch <clement@stupeflix.com>
3 years agoMerge commit '42dc214323637464759354912e18b2bee1884dd1'
Clément Bœsch [Wed, 29 Jun 2016 09:46:36 +0000 (11:46 +0200)]
Merge commit '42dc214323637464759354912e18b2bee1884dd1'

* commit '42dc214323637464759354912e18b2bee1884dd1':
  mpc: Drop unused GetBitContext context member

Merged-by: Clément Bœsch <clement@stupeflix.com>
3 years agoMerge commit '85b8403c6fd11e1c570caa970c7f435ac5f9583e'
Clément Bœsch [Wed, 29 Jun 2016 09:45:37 +0000 (11:45 +0200)]
Merge commit '85b8403c6fd11e1c570caa970c7f435ac5f9583e'

* commit '85b8403c6fd11e1c570caa970c7f435ac5f9583e':
  svq1enc: Drop unused GetBitContext context member

Merged-by: Clément Bœsch <clement@stupeflix.com>
3 years agoMerge commit '6d8fd614ff957af242efcd8a6a0619874382f3a4'
Clément Bœsch [Wed, 29 Jun 2016 09:43:57 +0000 (11:43 +0200)]
Merge commit '6d8fd614ff957af242efcd8a6a0619874382f3a4'

* commit '6d8fd614ff957af242efcd8a6a0619874382f3a4':
  vorbis: Kill some pointless debug code

Merged-by: Clément Bœsch <clement@stupeflix.com>
3 years agoMerge commit '59c6509d9f0236acbc317198eab76dab8320bced'
Clément Bœsch [Wed, 29 Jun 2016 09:42:42 +0000 (11:42 +0200)]
Merge commit '59c6509d9f0236acbc317198eab76dab8320bced'

* commit '59c6509d9f0236acbc317198eab76dab8320bced':
  mss2: Drop a silly assert

Merged-by: Clément Bœsch <clement@stupeflix.com>
3 years agolavc: move 2 more BITSTREAM_READER_LE definitions
Clément Bœsch [Wed, 29 Jun 2016 09:41:07 +0000 (11:41 +0200)]
lavc: move 2 more BITSTREAM_READER_LE definitions

This was mentioned to be in ae753dbd0de448b51f0e0b980c26b94747ec44f5 but
actually wasn't.

3 years agoMerge commit 'b668662939de3a02454cfc9ba3e6d10b87527a40'
Clément Bœsch [Wed, 29 Jun 2016 09:27:33 +0000 (11:27 +0200)]
Merge commit 'b668662939de3a02454cfc9ba3e6d10b87527a40'

* commit 'b668662939de3a02454cfc9ba3e6d10b87527a40':
  get_bits: Move BITSTREAM_READER_LE definition before all relevant #includes

The merge commit also includes changes for libavcodec/interplayacm.c and
libavcodec/truemotion2rt.c

Merged-by: Clément Bœsch <clement@stupeflix.com>
3 years agoMerge commit '09c4e5c5988c0037d108c5fc2a137d9ad488f7f4'
Clément Bœsch [Wed, 29 Jun 2016 09:20:20 +0000 (11:20 +0200)]
Merge commit '09c4e5c5988c0037d108c5fc2a137d9ad488f7f4'

* commit '09c4e5c5988c0037d108c5fc2a137d9ad488f7f4':
  indeo2: Drop disabled big-endian ir2_codes table

Merged-by: Clément Bœsch <clement@stupeflix.com>
3 years agoMerge commit 'b7f98659f21dce438c33b512e25fd64b8d07c347'
Clément Bœsch [Wed, 29 Jun 2016 09:14:57 +0000 (11:14 +0200)]
Merge commit 'b7f98659f21dce438c33b512e25fd64b8d07c347'

* commit 'b7f98659f21dce438c33b512e25fd64b8d07c347':
  Remove unnecessary get_bits.h #includes

Merged-by: Clément Bœsch <clement@stupeflix.com>
3 years agoMerge commit '2a48a75a6f508121b96b0732a9fe03a46303f579'
Clément Bœsch [Wed, 29 Jun 2016 09:09:36 +0000 (11:09 +0200)]
Merge commit '2a48a75a6f508121b96b0732a9fe03a46303f579'

* commit '2a48a75a6f508121b96b0732a9fe03a46303f579':
  sgirledec: simplify, no need to use reget buffer

This commit is a noop, see ccc3f4e7104eda0f72436720ebcdc2e916217c7a

Merged-by: Clément Bœsch <clement@stupeflix.com>
3 years agoMerge commit '6e2ad28cf76461b02d85ad178087ba0c628b8d9d'
Clément Bœsch [Wed, 29 Jun 2016 09:07:41 +0000 (11:07 +0200)]
Merge commit '6e2ad28cf76461b02d85ad178087ba0c628b8d9d'

* commit '6e2ad28cf76461b02d85ad178087ba0c628b8d9d':
  aic: add frame threading support

This commit is a noop, see 8e069eb525d46b8f89089e37fc7ac81b2d9b1092

Merged-by: Clément Bœsch <clement@stupeflix.com>
3 years agoMerge commit 'c3ed259e4fef64a1af4f6537be545fba47491aa9'
Clément Bœsch [Wed, 29 Jun 2016 09:03:55 +0000 (11:03 +0200)]
Merge commit 'c3ed259e4fef64a1af4f6537be545fba47491aa9'

* commit 'c3ed259e4fef64a1af4f6537be545fba47491aa9':
  fate: Move Canopus decoder tests to a separate file

Merged-by: Clément Bœsch <clement@stupeflix.com>
3 years agolavc/mediacodecdec_h264: add missing NAL headers to SPS/PPS buffers
Matthieu Bouron [Tue, 28 Jun 2016 10:25:27 +0000 (12:25 +0200)]
lavc/mediacodecdec_h264: add missing NAL headers to SPS/PPS buffers

Fixes a regression introduced by 0cd5e281df3f69c1ed8f2a72a5bcbf9691e1b5d5.

3 years agoavformat/mov: Check sample size
Michael Niedermayer [Tue, 28 Jun 2016 21:49:36 +0000 (23:49 +0200)]
avformat/mov: Check sample size

Fixes integer overflow
Fixes: poc.mp4

Found-by: ajax secure <ajax4sec@hotmail.com>
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
3 years agofate/webp : add test for lossy compression.
Martin Vignali [Sun, 26 Jun 2016 10:42:44 +0000 (12:42 +0200)]
fate/webp : add test for lossy compression.

the result of ffmpeg decoding is binary exact with the yuv output of
official decoder (dwebp)

Signed-off-by: James Almer <jamrial@gmail.com>
3 years agoavdevice/decklink_common: Replace rare spelling of Succesfully by 500 times more...
Michael Niedermayer [Tue, 28 Jun 2016 01:06:25 +0000 (03:06 +0200)]
avdevice/decklink_common: Replace rare spelling of Succesfully by 500 times more common one

Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
3 years agoavcodec/ccaption_dec: Fix mixed declaration and statement.
Michael Niedermayer [Tue, 28 Jun 2016 00:33:03 +0000 (02:33 +0200)]
avcodec/ccaption_dec: Fix mixed declaration and statement.

Found-by: ubitux
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
3 years agoavcodec/ccaption_dec: implement tab offset commands
Aman Gupta [Tue, 14 Jun 2016 18:57:42 +0000 (11:57 -0700)]
avcodec/ccaption_dec: implement tab offset commands

Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
3 years agoMAINTAINERS: remove 2.4 as 3.1 was released
Michael Niedermayer [Mon, 27 Jun 2016 13:16:54 +0000 (15:16 +0200)]
MAINTAINERS: remove 2.4 as 3.1 was released

Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
3 years agoMerge commit '20a8c78ce0a5baf37f6a94e2d1e57e186b6f4b54'
Clément Bœsch [Mon, 27 Jun 2016 18:10:35 +0000 (20:10 +0200)]
Merge commit '20a8c78ce0a5baf37f6a94e2d1e57e186b6f4b54'

* commit '20a8c78ce0a5baf37f6a94e2d1e57e186b6f4b54':
  avconv: Do not copy extradata if source buffer is empty

This commit is a noop, see 4d02dfbde475d249916eb19c360e890059aa6aa5

Merged-by: Clément Bœsch <u@pkh.me>
3 years agoMerge commit '38f99017e69bd25e88be87117237c29727c25635'
Clément Bœsch [Mon, 27 Jun 2016 17:54:37 +0000 (19:54 +0200)]
Merge commit '38f99017e69bd25e88be87117237c29727c25635'

* commit '38f99017e69bd25e88be87117237c29727c25635':
  vp9: Return the correct size when decoding a superframe

This commit is a noop, see c2f3715cb3fce093137591e3005de3e831b1f9fd

Merged-by: Clément Bœsch <u@pkh.me>
3 years agoMerge commit 'b2d5d6a7f20a255a5f3c9bf539cc507afd909ce5'
Clément Bœsch [Mon, 27 Jun 2016 17:48:21 +0000 (19:48 +0200)]
Merge commit 'b2d5d6a7f20a255a5f3c9bf539cc507afd909ce5'

* commit 'b2d5d6a7f20a255a5f3c9bf539cc507afd909ce5':
  build: Only enable symbol reduction if the compiler does proper DCE

Merged-by: Clément Bœsch <u@pkh.me>
3 years agoMerge commit 'c5fd4b50610f62cbb3baa4f4108139363128dea1'
Clément Bœsch [Mon, 27 Jun 2016 17:39:46 +0000 (19:39 +0200)]
Merge commit 'c5fd4b50610f62cbb3baa4f4108139363128dea1'

* commit 'c5fd4b50610f62cbb3baa4f4108139363128dea1':
  build: Simplify postprocessing of linker version script files

Merged-by: Clément Bœsch <u@pkh.me>
3 years agolavc/pnm_parser: disable parsing for text based PNMs
Clément Bœsch [Mon, 27 Jun 2016 15:54:22 +0000 (17:54 +0200)]
lavc/pnm_parser: disable parsing for text based PNMs

P1, P2, and P3 are respectively the text versions of PBM, PGM and PPM
files.

We can not obtain the buffer size using av_imgage_get_buffer_size() as
every pixel in the picture will occupy a random size between 16 and 32
bits ("4 " and "231 " are such example).

Ideally, we could look for the next header (or EOF) in the bytestream,
but this commit is meant to fix a decoding regression introduced by
48ac4532d437790e56b8ed5d0d467dc88685f035.

Fix Ticket #5670

3 years agoMerge commit '535a742c2695a9e0c586b50d7fa76e318232ff24'
Matthieu Bouron [Mon, 27 Jun 2016 15:51:57 +0000 (17:51 +0200)]
Merge commit '535a742c2695a9e0c586b50d7fa76e318232ff24'

* commit '535a742c2695a9e0c586b50d7fa76e318232ff24':
  build: Change structure of the linker version script templates

Merged-by: Matthieu Bouron <matthieu.bouron@stupeflix.com>
3 years agoChangelog: Add VideoToolbox encoder entry for 3.1
Rick Kern [Mon, 27 Jun 2016 15:43:13 +0000 (11:43 -0400)]
Changelog: Add VideoToolbox encoder entry for 3.1

Signed-off-by: Rick Kern <kernrj@gmail.com>
3 years agoMerge commit '5b1b495c8d21600eac694d50f428654a3125e217'
Matthieu Bouron [Mon, 27 Jun 2016 15:34:10 +0000 (17:34 +0200)]
Merge commit '5b1b495c8d21600eac694d50f428654a3125e217'

* commit '5b1b495c8d21600eac694d50f428654a3125e217':
  build: Print a message when generating version scripts

Merged-by: Matthieu Bouron <matthieu.bouron@stupeflix.com>
3 years agoasm: FF_-prefix internal macros used in inline assembly
Matthieu Bouron [Mon, 27 Jun 2016 15:21:04 +0000 (17:21 +0200)]
asm: FF_-prefix internal macros used in inline assembly

See merge commit '39d6d3618d48625decaff7d9bdbb45b44ef2a805'.

3 years agoMerge commit '1e9c5bf4c136fe9e010cc8a7e7270bba0d1bf45e'
Matthieu Bouron [Mon, 27 Jun 2016 15:18:25 +0000 (17:18 +0200)]
Merge commit '1e9c5bf4c136fe9e010cc8a7e7270bba0d1bf45e'

* commit '1e9c5bf4c136fe9e010cc8a7e7270bba0d1bf45e':
  asm: FF_-prefix internal macros used in inline assembly

This commit is a noop as the ASM codebase differs too much between libav
and ffmpeg. The corresponding chunks will be found in the next commit.

Merged-by: Matthieu Bouron <matthieu.bouron@stupeflix.com>
3 years agoavformat/mov: parse rtmd track timecode
Paul B Mahol [Sat, 25 Jun 2016 09:33:46 +0000 (11:33 +0200)]
avformat/mov: parse rtmd track timecode

Signed-off-by: Paul B Mahol <onemda@gmail.com>
3 years agoavdevice/decklink: fix mingw portability
Marton Balint [Sun, 26 Jun 2016 23:11:50 +0000 (01:11 +0200)]
avdevice/decklink: fix mingw portability

Fixes ticket #5669.

Signed-off-by: Marton Balint <cus@passwd.hu>
3 years agoconfigure: use c++98 for c++ files
Rick Kern [Sun, 26 Jun 2016 20:44:40 +0000 (16:44 -0400)]
configure: use c++98 for c++ files

Use c++98 standard instead of c++11.

Signed-off-by: Rick Kern <kernrj@gmail.com>
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
3 years agofate/webp : add test for webp lossless decoding (rgb and rgba)
Martin Vignali [Sat, 25 Jun 2016 19:53:23 +0000 (21:53 +0200)]
fate/webp : add test for webp lossless decoding (rgb and rgba)

output have been compared with official decoding tool output (dwebp)

Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
3 years agofate/exr : add tests for file with half and float channels
Martin Vignali [Sat, 25 Jun 2016 18:16:01 +0000 (20:16 +0200)]
fate/exr : add tests for file with half and float channels

Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
3 years agochangelog: fix entry order
James Almer [Sun, 26 Jun 2016 18:27:47 +0000 (15:27 -0300)]
changelog: fix entry order

Signed-off-by: James Almer <jamrial@gmail.com>
3 years agoUpdate FFmpeg 3.1 cut marker
James Almer [Sun, 26 Jun 2016 17:45:54 +0000 (14:45 -0300)]
Update FFmpeg 3.1 cut marker

Signed-off-by: James Almer <jamrial@gmail.com>
3 years agoavdevice/decklink: add support for setting input packet timestamp source
Marton Balint [Sat, 18 Jun 2016 22:35:44 +0000 (00:35 +0200)]
avdevice/decklink: add support for setting input packet timestamp source

Reviewed-by: Deti Fliegl <deti@fliegl.de>
Signed-off-by: Marton Balint <cus@passwd.hu>
3 years agoavdevice/decklink: add support for audio and video input selection
Marton Balint [Sat, 18 Jun 2016 10:04:15 +0000 (12:04 +0200)]
avdevice/decklink: add support for audio and video input selection

Reviewed-by: Deti Fliegl <deti@fliegl.de>
Signed-off-by: Marton Balint <cus@passwd.hu>
3 years agoavdevice/decklink: add support for setting duplex mode
Marton Balint [Sat, 11 Jun 2016 11:41:29 +0000 (13:41 +0200)]
avdevice/decklink: add support for setting duplex mode

This patch also makes BlackMagic drivers v10.6.1 a hard requirement.

Reviewed-by: Deti Fliegl <deti@fliegl.de>
Signed-off-by: Marton Balint <cus@passwd.hu>
3 years agoavdevice/decklink: always free decklink resources on error
Marton Balint [Sat, 18 Jun 2016 15:40:06 +0000 (17:40 +0200)]
avdevice/decklink: always free decklink resources on error

Reviewed-by: Deti Fliegl <deti@fliegl.de>
Signed-off-by: Marton Balint <cus@passwd.hu>
3 years agoavdevice/decklink: factorize device finder function
Marton Balint [Sat, 18 Jun 2016 14:55:47 +0000 (16:55 +0200)]
avdevice/decklink: factorize device finder function

Reviewed-by: Deti Fliegl <deti@fliegl.de>
Signed-off-by: Marton Balint <cus@passwd.hu>
3 years agoavdevice/decklink: remove unused itermode iterators
Marton Balint [Sat, 18 Jun 2016 14:04:30 +0000 (16:04 +0200)]
avdevice/decklink: remove unused itermode iterators

Reviewed-by: Deti Fliegl <deti@fliegl.de>
Signed-off-by: Marton Balint <cus@passwd.hu>
3 years agoavdevice/decklink: factorize cleanup function to common code
Marton Balint [Sat, 18 Jun 2016 13:49:01 +0000 (15:49 +0200)]
avdevice/decklink: factorize cleanup function to common code

Reviewed-by: Deti Fliegl <deti@fliegl.de>
Signed-off-by: Marton Balint <cus@passwd.hu>
3 years agoavdevice/decklink_dec: fix bitrate calculations n3.2-dev
Marton Balint [Sun, 19 Jun 2016 17:20:00 +0000 (19:20 +0200)]
avdevice/decklink_dec: fix bitrate calculations

Reviewed-by: Deti Fliegl <deti@fliegl.de>
Signed-off-by: Marton Balint <cus@passwd.hu>
3 years agoavcodec/libopenjpegenc: Set numresolutions by default to a value that is not too...
Michael Niedermayer [Sun, 26 Jun 2016 15:34:37 +0000 (17:34 +0200)]
avcodec/libopenjpegenc: Set numresolutions by default to a value that is not too large

Fixes issues with libopenjpeg 2.1

Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
3 years agoMerge commit 'dc40a70c5755bccfb1a1349639943e1f408bea50'
Hendrik Leppkes [Sun, 26 Jun 2016 13:53:00 +0000 (15:53 +0200)]
Merge commit 'dc40a70c5755bccfb1a1349639943e1f408bea50'

* commit 'dc40a70c5755bccfb1a1349639943e1f408bea50':
  Drop unnecessary libavutil/x86/asm.h #includes

Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
3 years agoMerge commit '5264e7ba217b3c0ceae813917134e1ab52573141'
Hendrik Leppkes [Sun, 26 Jun 2016 13:45:21 +0000 (15:45 +0200)]
Merge commit '5264e7ba217b3c0ceae813917134e1ab52573141'

* commit '5264e7ba217b3c0ceae813917134e1ab52573141':
  ac3: Check the array bound before dereferencing

See d85ebea3f3b68ebccfe308fa839fc30fa634e4de

Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
3 years agoMerge commit 'a86aa16088ad7f22a8918d71adb8c040d6033d84'
Hendrik Leppkes [Sun, 26 Jun 2016 13:44:43 +0000 (15:44 +0200)]
Merge commit 'a86aa16088ad7f22a8918d71adb8c040d6033d84'

* commit 'a86aa16088ad7f22a8918d71adb8c040d6033d84':
  vaapi_h264: Add trivial support for low-power encoding

Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
3 years agoMerge commit 'b51c7c6b8a5b35cfd06cb9655f9ec4c9f0ddd81b'
Hendrik Leppkes [Sun, 26 Jun 2016 13:44:35 +0000 (15:44 +0200)]
Merge commit 'b51c7c6b8a5b35cfd06cb9655f9ec4c9f0ddd81b'

* commit 'b51c7c6b8a5b35cfd06cb9655f9ec4c9f0ddd81b':
  vaapi_h264: Fix frame_num after non-reference frames

Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
3 years agoMerge commit '2bfa067d0b636e7b2004fb0ad5a53d0d48c6de32'
Hendrik Leppkes [Sun, 26 Jun 2016 13:44:25 +0000 (15:44 +0200)]
Merge commit '2bfa067d0b636e7b2004fb0ad5a53d0d48c6de32'

* commit '2bfa067d0b636e7b2004fb0ad5a53d0d48c6de32':
  vaapi_encode: Check config attributes before creating config

Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
3 years agoMerge commit '6641819feedb086ebba3d2be89b8d33980f367e1'
Hendrik Leppkes [Sun, 26 Jun 2016 13:43:05 +0000 (15:43 +0200)]
Merge commit '6641819feedb086ebba3d2be89b8d33980f367e1'

* commit '6641819feedb086ebba3d2be89b8d33980f367e1':
  build: Ignore generated mapfile and remove it on distclean

Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
3 years agoMerge commit 'f5c43884190be094749acfba104e3eab98d8ff1e'
Hendrik Leppkes [Sun, 26 Jun 2016 13:41:49 +0000 (15:41 +0200)]
Merge commit 'f5c43884190be094749acfba104e3eab98d8ff1e'

* commit 'f5c43884190be094749acfba104e3eab98d8ff1e':
  FATE: drop the audio stream from the dxtory test

Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
3 years agoMerge commit 'fe7b21c8f148493c6fbceb7f887a77531dd1ae0e'
Hendrik Leppkes [Sun, 26 Jun 2016 13:39:06 +0000 (15:39 +0200)]
Merge commit 'fe7b21c8f148493c6fbceb7f887a77531dd1ae0e'

* commit 'fe7b21c8f148493c6fbceb7f887a77531dd1ae0e':
  avconv: fix parsing bitstream filters

Not merged because ffmpeg_opt.c still uses the old BSF API.

Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
3 years agoMerge commit '80fb19bc234a3f2350d891adf39f3738a8e4849f'
Hendrik Leppkes [Sun, 26 Jun 2016 13:37:34 +0000 (15:37 +0200)]
Merge commit '80fb19bc234a3f2350d891adf39f3738a8e4849f'

* commit '80fb19bc234a3f2350d891adf39f3738a8e4849f':
  avconv: fix a check for av_bsf_get_by_name() return value

Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
3 years agoMerge commit '9f7590f4e497c12693247d7f935a20d7773a64dd'
Hendrik Leppkes [Sun, 26 Jun 2016 13:36:27 +0000 (15:36 +0200)]
Merge commit '9f7590f4e497c12693247d7f935a20d7773a64dd'

* commit '9f7590f4e497c12693247d7f935a20d7773a64dd':
  avconv_vaapi: use the hwcontext device creation API

Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
3 years agohwcontext_dxva2: Use GetDesktopWindow instead of GetShellWindow
Hendrik Leppkes [Sun, 26 Jun 2016 13:34:40 +0000 (15:34 +0200)]
hwcontext_dxva2: Use GetDesktopWindow instead of GetShellWindow

Improves compatibility with some MinGW variants,
see 771537edcf703434161c100e6898891546d1d4b3

3 years agoMerge commit '18c506e9e6e8df8b1d496d093077b8240ea68c28'
Hendrik Leppkes [Sun, 26 Jun 2016 13:34:01 +0000 (15:34 +0200)]
Merge commit '18c506e9e6e8df8b1d496d093077b8240ea68c28'

* commit '18c506e9e6e8df8b1d496d093077b8240ea68c28':
  avconv_dxva2: use the hwcontext device creation API

Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
3 years agoMerge commit 'f72db3f2f3a8c83a4f5dede8fa03434b2bf676c6'
Hendrik Leppkes [Sun, 26 Jun 2016 13:29:39 +0000 (15:29 +0200)]
Merge commit 'f72db3f2f3a8c83a4f5dede8fa03434b2bf676c6'

* commit 'f72db3f2f3a8c83a4f5dede8fa03434b2bf676c6':
  avconv_vdpau: use the hwcontext device creation API

Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
3 years agoMerge commit 'b8bf9194af602cf3a4bcd19a5e278e3d6d69f8fa'
Hendrik Leppkes [Sun, 26 Jun 2016 13:25:38 +0000 (15:25 +0200)]
Merge commit 'b8bf9194af602cf3a4bcd19a5e278e3d6d69f8fa'

* commit 'b8bf9194af602cf3a4bcd19a5e278e3d6d69f8fa':
  hwcontext_vaapi: implement device creation

Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
3 years agoMerge commit '8e70385a8ed06f96f1e9e35cf7b6788a5c56eded'
Hendrik Leppkes [Sun, 26 Jun 2016 13:25:24 +0000 (15:25 +0200)]
Merge commit '8e70385a8ed06f96f1e9e35cf7b6788a5c56eded'

* commit '8e70385a8ed06f96f1e9e35cf7b6788a5c56eded':
  hwcontext_dxva2: implement device creation

Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
3 years agoMerge commit '2e219b491bcc0845248345fdad31231b081e06d1'
Hendrik Leppkes [Sun, 26 Jun 2016 13:25:12 +0000 (15:25 +0200)]
Merge commit '2e219b491bcc0845248345fdad31231b081e06d1'

* commit '2e219b491bcc0845248345fdad31231b081e06d1':
  hwcontext_cuda: implement device creation

Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
3 years agoMerge commit '38392b2af815898b8716826c4e29d95c04fb2647'
Hendrik Leppkes [Sun, 26 Jun 2016 13:24:53 +0000 (15:24 +0200)]
Merge commit '38392b2af815898b8716826c4e29d95c04fb2647'

* commit '38392b2af815898b8716826c4e29d95c04fb2647':
  hwcontext_vdpau: implement device creation

Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
3 years agoMerge commit '1c9e8616c535ef496e7ee8a5cbc5e9e972a6977d'
Hendrik Leppkes [Sun, 26 Jun 2016 13:23:24 +0000 (15:23 +0200)]
Merge commit '1c9e8616c535ef496e7ee8a5cbc5e9e972a6977d'

* commit '1c9e8616c535ef496e7ee8a5cbc5e9e972a6977d':
  hwcontext: add a function for opening devices

Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
3 years agoMerge commit '24b5cff01bbac4e08acfd6d19c499e880988f520'
Hendrik Leppkes [Sun, 26 Jun 2016 13:18:56 +0000 (15:18 +0200)]
Merge commit '24b5cff01bbac4e08acfd6d19c499e880988f520'

* commit '24b5cff01bbac4e08acfd6d19c499e880988f520':
  lavc: handle hw_frames_ctx where necessary

Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
3 years agoMerge commit '4024b566d664a4b161d677554be52f32e7ad4236'
Hendrik Leppkes [Sun, 26 Jun 2016 13:12:48 +0000 (15:12 +0200)]
Merge commit '4024b566d664a4b161d677554be52f32e7ad4236'

* commit '4024b566d664a4b161d677554be52f32e7ad4236':
  golomb: Give svq3_get_se_golomb()/svq3_get_ue_golomb() better names

Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
3 years agoMerge commit '7ca4fdc046a945949866bb6fc550e3cab1fc8c00'
Hendrik Leppkes [Sun, 26 Jun 2016 13:06:47 +0000 (15:06 +0200)]
Merge commit '7ca4fdc046a945949866bb6fc550e3cab1fc8c00'

* commit '7ca4fdc046a945949866bb6fc550e3cab1fc8c00':
  fate: More fine-grained dependencies for demuxer tests

Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
3 years agoMerge commit '07377fb557909015338b4c215b87b9c73ea577ad'
Hendrik Leppkes [Sun, 26 Jun 2016 12:58:58 +0000 (14:58 +0200)]
Merge commit '07377fb557909015338b4c215b87b9c73ea577ad'

* commit '07377fb557909015338b4c215b87b9c73ea577ad':
  fate: More fine-grained dependencies for voice codec tests

Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
3 years agoMerge commit '3fdffc032e8ea5676bc0c2551b900c0dc887835b'
Hendrik Leppkes [Sun, 26 Jun 2016 12:51:33 +0000 (14:51 +0200)]
Merge commit '3fdffc032e8ea5676bc0c2551b900c0dc887835b'

* commit '3fdffc032e8ea5676bc0c2551b900c0dc887835b':
  rtsp: Use avcodec_descriptor_get instead of avcodec_find_decoder

Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
3 years agoMerge commit 'e47b8bbf0b54599d44b9330eb4d68cdde4f6d298'
Hendrik Leppkes [Sun, 26 Jun 2016 12:49:10 +0000 (14:49 +0200)]
Merge commit 'e47b8bbf0b54599d44b9330eb4d68cdde4f6d298'

* commit 'e47b8bbf0b54599d44b9330eb4d68cdde4f6d298':
  avcodec: Bump micro version after changing public JPEG 2000 defines

Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
3 years agoMerge commit 'ad61da054bd8c74a5d5b38d80846228fc6147108'
Hendrik Leppkes [Sun, 26 Jun 2016 12:41:05 +0000 (14:41 +0200)]
Merge commit 'ad61da054bd8c74a5d5b38d80846228fc6147108'

* commit 'ad61da054bd8c74a5d5b38d80846228fc6147108':
  jpeg2000: Fix profile define values

Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
3 years agoMerge commit 'ac84e618df4765ba751327497994066d0931e6a8'
Hendrik Leppkes [Sun, 26 Jun 2016 12:40:19 +0000 (14:40 +0200)]
Merge commit 'ac84e618df4765ba751327497994066d0931e6a8'

* commit 'ac84e618df4765ba751327497994066d0931e6a8':
  avfiltergraph: check the query_formats() return value

This commit is a noop, see 6a4c5c730ed67a7f472e43205fd96e91781796ce

Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
3 years agoMerge commit '2ef6dab0a79a9852a92ed80b07f9e32a37530d9e'
Hendrik Leppkes [Sun, 26 Jun 2016 12:35:10 +0000 (14:35 +0200)]
Merge commit '2ef6dab0a79a9852a92ed80b07f9e32a37530d9e'

* commit '2ef6dab0a79a9852a92ed80b07f9e32a37530d9e':
  lavc: document that avcodec_close() should not be used

Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
3 years agoMerge commit '04fc8e24a091ed1d77d7a3c0cbcfe60baec19a9f'
Hendrik Leppkes [Sun, 26 Jun 2016 12:34:53 +0000 (14:34 +0200)]
Merge commit '04fc8e24a091ed1d77d7a3c0cbcfe60baec19a9f'

* commit '04fc8e24a091ed1d77d7a3c0cbcfe60baec19a9f':
  lavc: deprecate avcodec_get_context_defaults3()

Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
3 years agoMerge commit '5f30ac27795f9f98043e8582ccaad8813104adc4'
Hendrik Leppkes [Sun, 26 Jun 2016 12:34:02 +0000 (14:34 +0200)]
Merge commit '5f30ac27795f9f98043e8582ccaad8813104adc4'

* commit '5f30ac27795f9f98043e8582ccaad8813104adc4':
  lavc: deprecate avcodec_copy_context()

Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
3 years agoMerge commit '14634429b915333f3612eaf41db3954222dc4aaf'
Hendrik Leppkes [Sun, 26 Jun 2016 12:32:38 +0000 (14:32 +0200)]
Merge commit '14634429b915333f3612eaf41db3954222dc4aaf'

* commit '14634429b915333f3612eaf41db3954222dc4aaf':
  lavf: update muxing doxy

Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
3 years agoMerge commit '74b1bf632f125a795e66e5fd0a060b9c7c55b7a3'
Hendrik Leppkes [Sun, 26 Jun 2016 12:31:53 +0000 (14:31 +0200)]
Merge commit '74b1bf632f125a795e66e5fd0a060b9c7c55b7a3'

* commit '74b1bf632f125a795e66e5fd0a060b9c7c55b7a3':
  mp3: Make the extrasize explicit

Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
3 years agoMerge commit '52567e8198669a1e7493c75771613f87a90466c3'
Hendrik Leppkes [Sun, 26 Jun 2016 12:19:48 +0000 (14:19 +0200)]
Merge commit '52567e8198669a1e7493c75771613f87a90466c3'

* commit '52567e8198669a1e7493c75771613f87a90466c3':
  get_bits: Drop some TRACE-level debug code

Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
3 years agoMerge commit 'e45a638f50cc1dbeb87b9792e68f57e77fc0c3b5'
Hendrik Leppkes [Sun, 26 Jun 2016 12:13:36 +0000 (14:13 +0200)]
Merge commit 'e45a638f50cc1dbeb87b9792e68f57e77fc0c3b5'

* commit 'e45a638f50cc1dbeb87b9792e68f57e77fc0c3b5':
  dump: Drop unused variable

Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
3 years agoMerge commit 'e2a3df1a464091075040a81ffc419fa21a8a5fd8'
Hendrik Leppkes [Sun, 26 Jun 2016 12:08:51 +0000 (14:08 +0200)]
Merge commit 'e2a3df1a464091075040a81ffc419fa21a8a5fd8'

* commit 'e2a3df1a464091075040a81ffc419fa21a8a5fd8':
  avconv: Use more precise deprecation ifdefs

The PSNR functionality is not deprecated in ffmpeg.

Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
3 years agoMerge commit '35c858066840352d6d43385bbc728467c5150974'
Hendrik Leppkes [Sun, 26 Jun 2016 12:05:57 +0000 (14:05 +0200)]
Merge commit '35c858066840352d6d43385bbc728467c5150974'

* commit '35c858066840352d6d43385bbc728467c5150974':
  avconv: stop using AVStream.codec

Not merged, as ffmpeg.c is not migrated to codecpar yet, and this commit
only changes minor parts of AVStream.codec usage, which should get applied
after ffmpeg.c is using codecpar.

Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
3 years agoavcodec: add YUY2 Lossless Codec decoder
Paul B Mahol [Mon, 13 Jun 2016 10:17:44 +0000 (12:17 +0200)]
avcodec: add YUY2 Lossless Codec decoder

Signed-off-by: Paul B Mahol <onemda@gmail.com>
3 years agodoc/APIchanges: Add FFmpeg 3.1 cut marker
Michael Niedermayer [Sun, 26 Jun 2016 01:13:17 +0000 (03:13 +0200)]
doc/APIchanges: Add FFmpeg 3.1 cut marker

Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
3 years agodoc/APIchanges: Fill in and correct more stuff
Michael Niedermayer [Sat, 25 Jun 2016 23:38:18 +0000 (01:38 +0200)]
doc/APIchanges: Fill in and correct more stuff

Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
3 years agoavfilter/vf_paletteuse: enable skip_initial_unpaired
Michael Niedermayer [Fri, 24 Jun 2016 22:23:10 +0000 (00:23 +0200)]
avfilter/vf_paletteuse: enable skip_initial_unpaired

Fixes crash due to unprocessed input being passed through

This fixes the last segfault caused by mixing 3.0 and 3.1 libs and
applications

Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
3 years agoavfilter/dualinput: Add support to skip initial unpaired frames
Michael Niedermayer [Fri, 24 Jun 2016 22:22:47 +0000 (00:22 +0200)]
avfilter/dualinput: Add support to skip initial unpaired frames

Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
3 years agoavcodec/h264_sei: Do not skip subsequent SEIs on errors potentially caused by missing...
Michael Niedermayer [Tue, 21 Jun 2016 10:35:47 +0000 (12:35 +0200)]
avcodec/h264_sei: Do not skip subsequent SEIs on errors potentially caused by missing parameter sets.

Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
3 years agoavfilter/src_movie: Add option to remove timestamp discontinuities
Michael Niedermayer [Wed, 25 May 2016 15:55:29 +0000 (17:55 +0200)]
avfilter/src_movie: Add option to remove timestamp discontinuities

This can also be extended to remove discontiuities caused by seek commands

Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
3 years agoavformat/tee: Support arbitrary number of slaves
Jan Sebechlebsky [Sat, 25 Jun 2016 15:14:24 +0000 (17:14 +0200)]
avformat/tee: Support arbitrary number of slaves

Signed-off-by: Jan Sebechlebsky <sebechlebskyjan@gmail.com>
3 years agoavcodec/nvenc: Bring encoder names in line with other encoders
Timo Rothenpieler [Sat, 25 Jun 2016 20:24:13 +0000 (22:24 +0200)]
avcodec/nvenc: Bring encoder names in line with other encoders

3 years agolavf/srtdec: fix indent
Rodger Combs [Sat, 25 Jun 2016 20:53:11 +0000 (15:53 -0500)]
lavf/srtdec: fix indent