ffmpeg.git
18 months 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>
18 months 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>
18 months 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>
18 months 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>
18 months 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>
18 months 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>
18 months 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>
18 months 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>
18 months 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>
18 months 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>
18 months 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>
18 months 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>
18 months 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>
18 months 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>
18 months 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>
18 months 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>
18 months 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>
18 months 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>
18 months 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>
18 months 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>
18 months 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>
18 months 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>
18 months 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>
18 months 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>
18 months 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>
18 months 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>
18 months 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>
18 months 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

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

18 months agolavf: update auto-bsf to new BSF API
Rodger Combs [Wed, 20 Apr 2016 06:15:35 +0000 (01:15 -0500)]
lavf: update auto-bsf to new BSF API

18 months agolavf: deprecate av_apply_bitstream_filters
Rodger Combs [Wed, 20 Apr 2016 06:11:59 +0000 (01:11 -0500)]
lavf: deprecate av_apply_bitstream_filters

18 months agolavf/srtdec: fix probing files with negative first timestamps
Rodger Combs [Mon, 6 Jun 2016 18:26:36 +0000 (13:26 -0500)]
lavf/srtdec: fix probing files with negative first timestamps

18 months agoomx: Don't return > 0 from omx_encode_frame
Martin Storsjö [Thu, 23 Jun 2016 22:13:16 +0000 (01:13 +0300)]
omx: Don't return > 0 from omx_encode_frame

The encode function is supposed to just return 0 on success.
This stems from a mixup with the return value of decode functions.

Reviewed-by: Jan Gerber <j@v2v.cc>
Signed-off-by: Martin Storsjö <martin@martin.st>
18 months agoavformat/format: Fix registering a format more than once and related races
Michael Niedermayer [Thu, 7 Apr 2016 15:26:56 +0000 (17:26 +0200)]
avformat/format: Fix registering a format more than once and related races

Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
18 months agolavfi/subtitles: remove unecessary checks
Clément Bœsch [Sat, 25 Jun 2016 17:14:21 +0000 (19:14 +0200)]
lavfi/subtitles: remove unecessary checks

18 months agolavfi/subtitles: fix memleak after 6bcb1e1a
Clément Bœsch [Sat, 25 Jun 2016 17:11:51 +0000 (19:11 +0200)]
lavfi/subtitles: fix memleak after 6bcb1e1a

Spotted-by: James Almer <jamrial@gmail.com>
18 months agoavcodec/omx: fix deprecation warning for ff_alloc_packet
Aman Gupta [Thu, 5 May 2016 18:54:50 +0000 (14:54 -0400)]
avcodec/omx: fix deprecation warning for ff_alloc_packet

Tested-by: Jan Gerber <j@v2v.cc>
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
18 months agoavcodec/exr: add missed hunks from previous exr commit
Martin Vignali [Sat, 25 Jun 2016 16:24:12 +0000 (18:24 +0200)]
avcodec/exr: add missed hunks from previous exr commit

18 months agoavcodec/exr: fix reading float channel when there is half and float channels in a...
Martin Vignali [Sat, 25 Jun 2016 15:56:03 +0000 (17:56 +0200)]
avcodec/exr: fix reading float channel when there is half and float channels in a file

18 months agolavfi/subtitles: switch to codecpar
Clément Bœsch [Sat, 25 Jun 2016 14:41:38 +0000 (16:41 +0200)]
lavfi/subtitles: switch to codecpar

18 months agoavformat/movenc: add option to use keys/mdta atoms for metadata
David Murmann [Wed, 22 Jun 2016 13:27:07 +0000 (15:27 +0200)]
avformat/movenc: add option to use keys/mdta atoms for metadata

Add -movflags use_metadata_tags to the mov muxer. This will cause
the muxer to write all metadata to the file in the keys and mtda
atoms.

Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
18 months agolavc/neontest: fix constness in arm/aarch64 avcodec_open2() wrappers
Clément Bœsch [Sat, 25 Jun 2016 11:41:13 +0000 (13:41 +0200)]
lavc/neontest: fix constness in arm/aarch64 avcodec_open2() wrappers

18 months agolavf/utils: fix const warning at a find_decoder() call
Clément Bœsch [Sat, 25 Jun 2016 11:38:53 +0000 (13:38 +0200)]
lavf/utils: fix const warning at a find_decoder() call

18 months agoffmpeg: do not use deprecated AVSubtitleRect.pict
Clément Bœsch [Sat, 25 Jun 2016 11:35:46 +0000 (13:35 +0200)]
ffmpeg: do not use deprecated AVSubtitleRect.pict

18 months agoMerge commit '3399a26d3f57d462e839c0ee51223ae9aca20852'
Clément Bœsch [Sat, 25 Jun 2016 09:52:11 +0000 (11:52 +0200)]
Merge commit '3399a26d3f57d462e839c0ee51223ae9aca20852'

* commit '3399a26d3f57d462e839c0ee51223ae9aca20852':
  nvenc: allow setting the number of slices
  nvenc: De-compensate aspect ratio compensation of DVD-like content.
  nvenc: list the major contributors in the copyright header
  configure: Don't require nonfree for nvenc
  nvenc: drop the hard dependency on CUDA
  nvenc: only support HW frames when CUDA is enabled
  nvenc: write the VUI signal properties for HEVC
  nvenc: only write the VUI signal type fields if they are set
  nvenc: Generate bufferingPeriod/pictureTiming SEI
  nvenc: Delay frame output to increase encoding speed
  nvenc: add support for lossless encoding
  nvenc: Generate AUD NAL units for better compatiblity
  nvenc: fix the rc option definitions

All these commits are noop as requested by Timo Rothenpieler.

<BtbN> andrey_turkin, ubitux, yeah, I like the current state of nvenc in
ffmpeg, I think most remaining differences should be merged on the libav
side of things. At least I'm not aware of anything that's missing in
ffmpeg.

Merged-by: Clément Bœsch <u@pkh.me>
18 months agoMerge commit '65dc7ca4c8e7e56362626a5d31e563e80108f104'
Clément Bœsch [Sat, 25 Jun 2016 09:46:08 +0000 (11:46 +0200)]
Merge commit '65dc7ca4c8e7e56362626a5d31e563e80108f104'

* commit '65dc7ca4c8e7e56362626a5d31e563e80108f104':
  Add release notes for 12.

This commit is a noop, but we absolutely need someone to write the
release notes.

Merged-by: Clément Bœsch <u@pkh.me>
18 months agoMerge commit 'd68fb1475856cf93199e2bc4eee3063902c35df7'
Clément Bœsch [Sat, 25 Jun 2016 09:42:57 +0000 (11:42 +0200)]
Merge commit 'd68fb1475856cf93199e2bc4eee3063902c35df7'

* commit 'd68fb1475856cf93199e2bc4eee3063902c35df7':
  mjpegdec: Properly fail on malloc failure

Merged-by: Clément Bœsch <u@pkh.me>
18 months agoMerge commit '85ce9636e42dbda06b7d0af76a528a64b113fb3a'
Clément Bœsch [Sat, 25 Jun 2016 09:32:26 +0000 (11:32 +0200)]
Merge commit '85ce9636e42dbda06b7d0af76a528a64b113fb3a'

* commit '85ce9636e42dbda06b7d0af76a528a64b113fb3a':
  configure: move the hardware accel libs' entries in the configure output

Merged-by: Clément Bœsch <u@pkh.me>
18 months agoMerge commit 'c0f4c7db9fea1c07d290a298b8db858b7ceed96d'
Clément Bœsch [Sat, 25 Jun 2016 09:23:19 +0000 (11:23 +0200)]
Merge commit 'c0f4c7db9fea1c07d290a298b8db858b7ceed96d'

* commit 'c0f4c7db9fea1c07d290a298b8db858b7ceed96d':
  configure: move the hardware accel libs' entries in the help text

Merged-by: Clément Bœsch <u@pkh.me>
18 months agoMerge commit '5e2203448ab4cc8ea1d933b87f1b39b009201044'
Clément Bœsch [Sat, 25 Jun 2016 09:01:50 +0000 (11:01 +0200)]
Merge commit '5e2203448ab4cc8ea1d933b87f1b39b009201044'

* commit '5e2203448ab4cc8ea1d933b87f1b39b009201044':
  configure: improve the help text for external libraries

Only merged the explanation paragraphs. The removal of "enable/disable"
and "[no]" would create too much inconsistency and might cause
confusion.

Merged-by: Clément Bœsch <u@pkh.me>
18 months agoMerge commit '0d95d88fbd1aeadafb8b0b1bfb880bf21b33132c'
Clément Bœsch [Sat, 25 Jun 2016 08:46:08 +0000 (10:46 +0200)]
Merge commit '0d95d88fbd1aeadafb8b0b1bfb880bf21b33132c'

* commit '0d95d88fbd1aeadafb8b0b1bfb880bf21b33132c':
  lavc: revert the Makefile part of 330177b

Merged-by: Clément Bœsch <u@pkh.me>
18 months agomovenc: mark astronomical_body const string as static
Clément Bœsch [Sat, 25 Jun 2016 08:30:28 +0000 (10:30 +0200)]
movenc: mark astronomical_body const string as static

18 months agolavd/decklink: Fix compile issue on OS X
Rick Kern [Thu, 23 Jun 2016 22:57:07 +0000 (18:57 -0400)]
lavd/decklink: Fix compile issue on OS X

Fixes #4124: Invalid argument '-std=c99' not allowed with 'C++/ObjC++'
C++ files fail to compile. This adds '-std=c++11' to CXX_FLAGS to fix.

Signed-off-by: Rick Kern <kernrj@gmail.com>
18 months agoavcodec/ppc: fix broken build when compiling libavcodec with LLVM on PPC backend
Jing Yu [Thu, 23 Jun 2016 23:36:46 +0000 (16:36 -0700)]
avcodec/ppc: fix broken build when compiling libavcodec with LLVM on PPC backend

This commit fixes a broken build when compiling libavcodec with LLVM
compiler. These assembly files use non-standard format that is only
supported by GCC compiler. It would be nice to use a common standard
format. With this patch, both GCC and LLVM can build and generate the
same objects.

Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
18 months agoavformat: Fix ff_interleaved_peek()
Michael Niedermayer [Sat, 25 Jun 2016 00:54:43 +0000 (02:54 +0200)]
avformat: Fix ff_interleaved_peek()

Fixes assertion failures in movenc

Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
18 months agoavformat/matroskadec: Call matroska_read_close() on header parsing error
Michael Niedermayer [Fri, 24 Jun 2016 16:26:46 +0000 (18:26 +0200)]
avformat/matroskadec: Call matroska_read_close() on header parsing error

Fixes memleak
Fixes Ticket5169

Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
18 months agofate: add anequalizer test
Petru Rares Sincraian [Wed, 22 Jun 2016 10:58:14 +0000 (12:58 +0200)]
fate: add anequalizer test

Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
18 months agoMerge commit 'ded4a6543dfb5a2f1d9f7fb8d3ab27a1872c22b3'
Clément Bœsch [Fri, 24 Jun 2016 09:16:52 +0000 (11:16 +0200)]
Merge commit 'ded4a6543dfb5a2f1d9f7fb8d3ab27a1872c22b3'

* commit 'ded4a6543dfb5a2f1d9f7fb8d3ab27a1872c22b3':
  xtea-test: Use struct allocation functions from the API

Merged-by: Clément Bœsch <clement@stupeflix.com>
18 months agoMerge commit '8131bd4c22ad59b040173f67a5b2edb75863e801'
Clément Bœsch [Fri, 24 Jun 2016 09:14:23 +0000 (11:14 +0200)]
Merge commit '8131bd4c22ad59b040173f67a5b2edb75863e801'

* commit '8131bd4c22ad59b040173f67a5b2edb75863e801':
  blowfish-test: Use struct allocation functions from the API

Merged-by: Clément Bœsch <clement@stupeflix.com>
18 months agoMerge commit 'a86ef80494d759807a5ef8dd12838f0690092e37'
Clément Bœsch [Fri, 24 Jun 2016 09:10:35 +0000 (11:10 +0200)]
Merge commit 'a86ef80494d759807a5ef8dd12838f0690092e37'

* commit 'a86ef80494d759807a5ef8dd12838f0690092e37':
  blowfish-test: Return different values for different errors

Merged-by: Clément Bœsch <clement@stupeflix.com>
18 months agoMerge commit 'b84f3a40034d28828c4ca639d012479a7eaace28'
Clément Bœsch [Fri, 24 Jun 2016 09:08:33 +0000 (11:08 +0200)]
Merge commit 'b84f3a40034d28828c4ca639d012479a7eaace28'

* commit 'b84f3a40034d28828c4ca639d012479a7eaace28':
  movenc: Write 'loci' geotag metadata for 3gp and mp4

Merged-by: Clément Bœsch <clement@stupeflix.com>
18 months agoMerge commit 'f12a705ee570e16ca692c66b62821a2dbdf82566'
Clément Bœsch [Fri, 24 Jun 2016 09:01:40 +0000 (11:01 +0200)]
Merge commit 'f12a705ee570e16ca692c66b62821a2dbdf82566'

* commit 'f12a705ee570e16ca692c66b62821a2dbdf82566':
  movenc: Factorize a function for finding a metadata entry and the associated language

Merged-by: Clément Bœsch <clement@stupeflix.com>
18 months agoMerge commit 'daec1651f1c0f8f8e704db375a2ecb364a722fa1'
Clément Bœsch [Fri, 24 Jun 2016 08:54:48 +0000 (10:54 +0200)]
Merge commit 'daec1651f1c0f8f8e704db375a2ecb364a722fa1'

* commit 'daec1651f1c0f8f8e704db375a2ecb364a722fa1':
  movenc: Write ?xyz geotag metadata for mov files

This commit is a noop, see a3ec1d6abddb98f7c3d4f280d71e008e88a2d385

Merged-by: Clément Bœsch <clement@stupeflix.com>
18 months agoMerge commit 'bc43131997a456ecdff160eab288395f5adb8d72'
Clément Bœsch [Fri, 24 Jun 2016 08:53:22 +0000 (10:53 +0200)]
Merge commit 'bc43131997a456ecdff160eab288395f5adb8d72'

* commit 'bc43131997a456ecdff160eab288395f5adb8d72':
  mov: Also export loci altitude

This commit is a noop, see 08b7d19deff96a0adae93ba7d585176036442f31

Merged-by: Clément Bœsch <clement@stupeflix.com>
18 months agoMerge commit '94d8141c8cd96c176f7d4bdb74a95331ec7db19b'
Clément Bœsch [Fri, 24 Jun 2016 08:51:13 +0000 (10:51 +0200)]
Merge commit '94d8141c8cd96c176f7d4bdb74a95331ec7db19b'

* commit '94d8141c8cd96c176f7d4bdb74a95331ec7db19b':
  mov: Append place name instead of overwriting for loci

This commit is a noop, see 1607f774949add9e93bba6f288c9c5bf2c10d880

Merged-by: Clément Bœsch <clement@stupeflix.com>
18 months agoMerge commit 'f126365cdad6327e6def8ceb918eaf538fbb97b3'
Clément Bœsch [Fri, 24 Jun 2016 08:49:05 +0000 (10:49 +0200)]
Merge commit 'f126365cdad6327e6def8ceb918eaf538fbb97b3'

* commit 'f126365cdad6327e6def8ceb918eaf538fbb97b3':
  mov: Fix parsing short loci

This commit is a noop, see 50393bce31a5618f5125aaaf97bb69886fc4261d

Merged-by: Clément Bœsch <clement@stupeflix.com>
18 months agoMerge commit '704d2bd18be8f134cb9ab19463a3c4eb63233dbd'
Clément Bœsch [Fri, 24 Jun 2016 08:44:57 +0000 (10:44 +0200)]
Merge commit '704d2bd18be8f134cb9ab19463a3c4eb63233dbd'

* commit '704d2bd18be8f134cb9ab19463a3c4eb63233dbd':
  mov: Print reason of loci parsing failure

See 9e4f0cfc8ff4ab635ea12bdbd8d85d8bb1ba25f9

Merged-by: Clément Bœsch <clement@stupeflix.com>
18 months agoMerge commit 'd34826c33d401929b2ff8aee161fd39ad0a73613'
Clément Bœsch [Fri, 24 Jun 2016 08:44:00 +0000 (10:44 +0200)]
Merge commit 'd34826c33d401929b2ff8aee161fd39ad0a73613'

* commit 'd34826c33d401929b2ff8aee161fd39ad0a73613':
  mov: Add a comment referring to the standard that defines the loci box

Merged-by: Clément Bœsch <clement@stupeflix.com>
18 months agoavfilter/showcqt: set some frame properties
Muhammad Faiz [Fri, 24 Jun 2016 08:06:39 +0000 (15:06 +0700)]
avfilter/showcqt: set some frame properties

Signed-off-by: Muhammad Faiz <mfcc64@gmail.com>
18 months agoavcodec/flac_parser: Increase FLAC_MAX_SEQUENTIAL_HEADERS by 1
Michael Niedermayer [Fri, 24 Jun 2016 00:08:41 +0000 (02:08 +0200)]
avcodec/flac_parser: Increase FLAC_MAX_SEQUENTIAL_HEADERS by 1

Fixes Ticket5343

Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
18 months agoMerge commit '72d621069fc301b431fac36b5281699a362562f2'
Matthieu Bouron [Thu, 23 Jun 2016 20:30:37 +0000 (22:30 +0200)]
Merge commit '72d621069fc301b431fac36b5281699a362562f2'

* commit '72d621069fc301b431fac36b5281699a362562f2':
  movenc: Add a missed const

Merged-by: Matthieu Bouron <matthieu.bouron@stupeflix.com>
18 months agoMerge commit 'a79aafd0b4d37eda6f15dc68e6509d4e815290c9'
Matthieu Bouron [Thu, 23 Jun 2016 20:20:10 +0000 (22:20 +0200)]
Merge commit 'a79aafd0b4d37eda6f15dc68e6509d4e815290c9'

* commit 'a79aafd0b4d37eda6f15dc68e6509d4e815290c9':
  movenc: Add a test for VFR with b-frames, with a duration change at a fragment end

Merged-by: Matthieu Bouron <matthieu.bouron@stupeflix.com>
18 months agoMerge commit 'e1eb0fc960163402bbb4e630185790488f7d28ed'
Matthieu Bouron [Thu, 23 Jun 2016 20:02:31 +0000 (22:02 +0200)]
Merge commit 'e1eb0fc960163402bbb4e630185790488f7d28ed'

* commit 'e1eb0fc960163402bbb4e630185790488f7d28ed':
  movenc: Use packets in interleaving queues for the duration at the end of fragments

Merged-by: Matthieu Bouron <matthieu.bouron@stupeflix.com>
18 months agoavformat/g729dec: Fix av_log() formating string
Michael Niedermayer [Thu, 23 Jun 2016 19:37:05 +0000 (21:37 +0200)]
avformat/g729dec: Fix av_log() formating string

Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
18 months agoavcodec/libx264: Remove unused variable
Michael Niedermayer [Thu, 23 Jun 2016 19:36:02 +0000 (21:36 +0200)]
avcodec/libx264: Remove unused variable

Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
18 months agoMAINTAINERS: purge a bunch of entries
Clément Bœsch [Thu, 23 Jun 2016 17:25:16 +0000 (19:25 +0200)]
MAINTAINERS: purge a bunch of entries

This is definitely not complete.

Anton, Diego and Luca are still maintaining their code in Libav, but are
unwilling to do so in FFmpeg, so removing these entries will prevent
them from getting poked by our users.

Måns, Justin, Kostya and Jason left both projects a while ago.

18 months agoMerge commit 'fd4957d9c67996e7d218fd36b4168c9cb85f9ea7'
Matthieu Bouron [Thu, 23 Jun 2016 16:03:49 +0000 (18:03 +0200)]
Merge commit 'fd4957d9c67996e7d218fd36b4168c9cb85f9ea7'

* commit 'fd4957d9c67996e7d218fd36b4168c9cb85f9ea7':
  movenc-test: Test write_data_type

Merged-by: Matthieu Bouron <matthieu.bouron@stupeflix.com>
18 months agoMerge commit '71852a1ba89abc8749e309d9d662c49d47e19531'
Matthieu Bouron [Thu, 23 Jun 2016 15:57:34 +0000 (17:57 +0200)]
Merge commit '71852a1ba89abc8749e309d9d662c49d47e19531'

* commit '71852a1ba89abc8749e309d9d662c49d47e19531':
  matroskaenc: Provide output bytestream markers

Merged-by: Matthieu Bouron <matthieu.bouron@stupeflix.com>
18 months agotests/api: add .gitignore
Clément Bœsch [Thu, 23 Jun 2016 15:49:32 +0000 (17:49 +0200)]
tests/api: add .gitignore

Fixes regression since 5d48e4eafa6c4559683892b8638d10508125f3cf

18 months agoMerge commit 'dbbaad32e36b9046cd19d6e3329e2ca7ab49b401'
Matthieu Bouron [Thu, 23 Jun 2016 15:52:14 +0000 (17:52 +0200)]
Merge commit 'dbbaad32e36b9046cd19d6e3329e2ca7ab49b401'

* commit 'dbbaad32e36b9046cd19d6e3329e2ca7ab49b401':
  movenc: Provide output bytestream markers for fragmented content

Merged-by: Matthieu Bouron <matthieu.bouron@stupeflix.com>
18 months agoMerge commit '371df9ba71393a1c5429d5f40c76348b30e556c7'
Matthieu Bouron [Thu, 23 Jun 2016 15:43:19 +0000 (17:43 +0200)]
Merge commit '371df9ba71393a1c5429d5f40c76348b30e556c7'

* commit '371df9ba71393a1c5429d5f40c76348b30e556c7':
  flvenc: Provide output bytestream markers

Merged-by: Matthieu Bouron <matthieu.bouron@stupeflix.com>
18 months agoMerge commit 'db7968bff4851c2be79b15b2cb2ae747424d2fca'
Matthieu Bouron [Thu, 23 Jun 2016 13:27:00 +0000 (15:27 +0200)]
Merge commit 'db7968bff4851c2be79b15b2cb2ae747424d2fca'

* commit 'db7968bff4851c2be79b15b2cb2ae747424d2fca':
  avio: Allow custom IO users to get labels for the output bytestream

Merged-by: Matthieu Bouron <matthieu.bouron@stupeflix.com>
18 months agolavc/mediacodec: increase buffer dequeue timeout when the codec needs to be drained
Matthieu Bouron [Mon, 20 Jun 2016 16:15:21 +0000 (18:15 +0200)]
lavc/mediacodec: increase buffer dequeue timeout when the codec needs to be drained

Increase buffer dequeue timeout when the codec needs to be drained as it
could happen that no input buffer is available when we receive a null
packet for the first time (meaning we are unable to signal end of stream
and mark the codec as draining).

Fixes potential loss of last frames after sending a null packet.

18 months agolavc/mediacodec: rely on buffer flags to detect end of stream
Matthieu Bouron [Mon, 20 Jun 2016 14:41:21 +0000 (16:41 +0200)]
lavc/mediacodec: rely on buffer flags to detect end of stream

18 months agolavc/mediacodec: re-indent after previous commit
Matthieu Bouron [Mon, 20 Jun 2016 14:30:21 +0000 (16:30 +0200)]
lavc/mediacodec: re-indent after previous commit

18 months agolavc/mediacodec: discard 0-sized buffers
Matthieu Bouron [Mon, 20 Jun 2016 14:29:18 +0000 (16:29 +0200)]
lavc/mediacodec: discard 0-sized buffers

Their only purpose is to carry the end of stream flag.

18 months agoffprobe: print stereo3d information
Clément Bœsch [Thu, 23 Jun 2016 11:36:39 +0000 (13:36 +0200)]
ffprobe: print stereo3d information

Based on 8e757716c61e0563a63829e30b02d5ba2a422ad6

See https://github.com/mpv-player/mpv/issues/1045 for mk3d
elektranox.org samples.

18 months agoffprobe: refactor pkt side data printing
Clément Bœsch [Thu, 23 Jun 2016 11:36:18 +0000 (13:36 +0200)]
ffprobe: refactor pkt side data printing

18 months agoMerge commit '8e757716c61e0563a63829e30b02d5ba2a422ad6'
Clément Bœsch [Thu, 23 Jun 2016 11:47:01 +0000 (13:47 +0200)]
Merge commit '8e757716c61e0563a63829e30b02d5ba2a422ad6'

* commit '8e757716c61e0563a63829e30b02d5ba2a422ad6':
  avprobe: Print stereo3d information

This commit is not merged as it doesn't apply at all in our tree. The
two following commits will add the same feature.

Merged-by: Clément Bœsch <clement@stupeflix.com>
18 months agoavcodec: remove libutvideo wrapper support
Derek Buitenhuis [Wed, 22 Jun 2016 11:31:32 +0000 (13:31 +0200)]
avcodec: remove libutvideo wrapper support

The 10-bit decoding support is available now in native decoder.

Signed-off-by: Paul B Mahol <onemda@gmail.com>
18 months agoavcodec/sheervideo: fix YbYr format decoding
Paul B Mahol [Thu, 23 Jun 2016 10:55:30 +0000 (12:55 +0200)]
avcodec/sheervideo: fix YbYr format decoding

Signed-off-by: Paul B Mahol <onemda@gmail.com>
18 months agoMerge commit '0c4468dc185fa8b9e7d6add914595c5e928b24fd'
Clément Bœsch [Thu, 23 Jun 2016 10:38:51 +0000 (12:38 +0200)]
Merge commit '0c4468dc185fa8b9e7d6add914595c5e928b24fd'

* commit '0c4468dc185fa8b9e7d6add914595c5e928b24fd':
  stereo3d: Add API to get name from value or value from name

Merged-by: Clément Bœsch <clement@stupeflix.com>
18 months agoMerge commit 'd621b2f795684f7119057f986066060adbe84220'
Clément Bœsch [Thu, 23 Jun 2016 10:26:16 +0000 (12:26 +0200)]
Merge commit 'd621b2f795684f7119057f986066060adbe84220'

* commit 'd621b2f795684f7119057f986066060adbe84220':
  lavf: Raw G.729 demuxer

Merged-by: Clément Bœsch <clement@stupeflix.com>
18 months agoMerge commit '34effe816f9f3df2e6b8bc738e2b5a86a24fd0d7'
Clément Bœsch [Thu, 23 Jun 2016 10:16:42 +0000 (12:16 +0200)]
Merge commit '34effe816f9f3df2e6b8bc738e2b5a86a24fd0d7'

* commit '34effe816f9f3df2e6b8bc738e2b5a86a24fd0d7':
  fate: Update fate-lavf-ts after commit 393596f9d5

This commit is a noop, see c0ff42bf6468c7440568ec15c81edc52289f0c8a

Merged-by: Clément Bœsch <clement@stupeflix.com>
18 months agoMerge commit 'b8de14bcdf876c7e236a6dd2ad35342ff4b42cf8'
Clément Bœsch [Thu, 23 Jun 2016 10:14:45 +0000 (12:14 +0200)]
Merge commit 'b8de14bcdf876c7e236a6dd2ad35342ff4b42cf8'

* commit 'b8de14bcdf876c7e236a6dd2ad35342ff4b42cf8':
  tools: Port to codec parameters API

Merged-by: Clément Bœsch <clement@stupeflix.com>
18 months agoavformat/mov: add more datatypes in metadata handling
David Murmann [Wed, 22 Jun 2016 13:20:33 +0000 (15:20 +0200)]
avformat/mov: add more datatypes in metadata handling

Implement variable sized big-endian integers, since these are found
in files created by ARRI cameras.

Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
18 months agoMerge commit '393596f9d51134d6e45d81ae129223f4faea1232'
Clément Bœsch [Thu, 23 Jun 2016 06:15:43 +0000 (08:15 +0200)]
Merge commit '393596f9d51134d6e45d81ae129223f4faea1232'

* commit '393596f9d51134d6e45d81ae129223f4faea1232':
  mpegtsenc: stop impersonating ses in sdt

This commit also includes the needed FATE updates later spotted by
Martin Storsjö and fixed in 34effe816f9f3df2e6b8bc738e2b5a86a24fd0d7 on
Libav side.

Merged-by: Clément Bœsch <u@pkh.me>
18 months agodshow: avoid duplicate NULL check before free
rogerdpack [Fri, 17 Jun 2016 20:04:34 +0000 (14:04 -0600)]
dshow: avoid duplicate NULL check before free

Signed-off-by: rogerdpack <rogerpack2005@gmail.com>
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
18 months agodshow: don't add two instances of same device to graphs
rogerdpack [Wed, 15 Jun 2016 08:17:11 +0000 (02:17 -0600)]
dshow: don't add two instances of same device to graphs

Signed-off-by: rogerdpack <rogerpack2005@gmail.com>
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
18 months agoMAINTAINERS: Remove Linux / PowerPC maintainer
Michael Niedermayer [Wed, 22 Jun 2016 22:49:29 +0000 (00:49 +0200)]
MAINTAINERS: Remove Linux / PowerPC maintainer

See: [FFmpeg-devel] PPC64: PowerPC Maintainer information is incorrect

Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>