ffmpeg.git
4 years agoavcodec/h264: Execute error concealment before marking the frame as done.
Michael Niedermayer [Fri, 19 Feb 2016 00:31:16 +0000 (01:31 +0100)]
avcodec/h264: Execute error concealment before marking the frame as done.

Fixes race condition causing artifacts
Fixes Ticket4122

Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
4 years agoavformat/avienc: Use avi_write_packet_internal() to store raw rgb in a more spec...
Michael Niedermayer [Wed, 17 Feb 2016 12:37:41 +0000 (13:37 +0100)]
avformat/avienc: Use avi_write_packet_internal() to store raw rgb in a more spec compliant way

Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
4 years agoRevert 4 commits to configure which broke dependency handling
Michael Niedermayer [Wed, 17 Feb 2016 22:34:54 +0000 (23:34 +0100)]
Revert 4 commits to configure which broke dependency handling

Revert "configure: Don't enable examples when --disable-everything is used"
reverted as the problematic commit will be reverted too
This reverts commit 02dfa64c088c87367c298a3f648454204656734f.

Revert "Merge commit 'a2bb771a3cded8a05137c0effb34f61a2bc78e22'"
This reverts commit e8ebcb0034c5d4e5df8ff407a5c28d8c53823236, reversing
changes made to 3bff005be8ea213c23160ee0ac286634a80a10e1.

Revert "Merge commit '21c750f240b9d0c41a258d1adee2d9f75ff378b6'"
This reverts commit 470bfab470893d45328f4e6e25d60b89c9af1abe, reversing
changes made to f97ee815cf25580cbb9d6bed304d9c22895f7074.

Revert "Revert "configure: Revert recent changes to disable-everything""
This reverts commit f97ee815cf25580cbb9d6bed304d9c22895f7074.

Reviewed-by: Hendrik Leppkes <h.leppkes@gmail.com>
Immediate commit suggested by BBB

4 years agolavf/options_table: mark use_wallclock_as_timestamps as boolean
Moritz Barsnick [Thu, 18 Feb 2016 13:47:10 +0000 (14:47 +0100)]
lavf/options_table: mark use_wallclock_as_timestamps as boolean

It is only used in a boolean context. Also clarify its documentation.

Signed-off-by: Moritz Barsnick <barsnick@gmx.net>
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
4 years agoavformat/avienc: Split avi_write_packet_internal() out
Michael Niedermayer [Wed, 17 Feb 2016 12:37:13 +0000 (13:37 +0100)]
avformat/avienc: Split avi_write_packet_internal() out

Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
4 years agoavformat: add ff_reshuffle_raw_rgb()
Michael Niedermayer [Wed, 17 Feb 2016 13:02:19 +0000 (14:02 +0100)]
avformat: add ff_reshuffle_raw_rgb()

Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
4 years agoavfilter: add BobWeaver deinterlacing filter
Thomas Mundt [Mon, 8 Feb 2016 00:00:42 +0000 (01:00 +0100)]
avfilter: add BobWeaver deinterlacing filter

4 years agoavfilter: add loop filters
Paul B Mahol [Thu, 11 Feb 2016 21:05:54 +0000 (22:05 +0100)]
avfilter: add loop filters

Signed-off-by: Paul B Mahol <onemda@gmail.com>
4 years agoffmpeg: Check best_effort_timestamp after rescale
Michael Niedermayer [Thu, 18 Feb 2016 00:07:33 +0000 (01:07 +0100)]
ffmpeg: Check best_effort_timestamp after rescale

Fixes integer overflow
Fixes: Ticket5126

Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
4 years agolavc/ccaption_dec: implement special and extended character sets
Aman Gupta [Mon, 15 Feb 2016 02:11:54 +0000 (18:11 -0800)]
lavc/ccaption_dec: implement special and extended character sets

character sets implemented as defined in https://en.wikipedia.org/wiki/EIA-608#Characters

4 years agolavc/ccaption_dec: do not ignore repeated character commands
Aman Gupta [Mon, 15 Feb 2016 02:11:53 +0000 (18:11 -0800)]
lavc/ccaption_dec: do not ignore repeated character commands

control codes in a cc stream can be repeated, and must be ignored.
however, repeated characters must not be ignored. the code attempted to
wipe prev_cmd in handle_char to allow repeated characters to be
processed, but prev_cmd would previously get reset _after_ handle_char()

i also moved the prev_cmd reset out from handle_char() so it can be
re-used for special character sets, which _must_ be ignored when
repeated.

4 years agotests/fate: added dnxhr parser regression test
Mark Reid [Tue, 16 Feb 2016 06:01:28 +0000 (22:01 -0800)]
tests/fate: added dnxhr parser regression test

Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
4 years agoavutil/hwcontext: Remove duplicate ;
Michael Niedermayer [Wed, 17 Feb 2016 17:22:55 +0000 (18:22 +0100)]
avutil/hwcontext: Remove duplicate ;

Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
4 years agoconfigure: Don't enable examples when --disable-everything is used
Derek Buitenhuis [Wed, 17 Feb 2016 19:20:49 +0000 (19:20 +0000)]
configure: Don't enable examples when --disable-everything is used

This resotres old behavior.

Signed-off-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
4 years agoavfilter/drawutils: >8 bit support
Paul B Mahol [Mon, 15 Feb 2016 16:07:33 +0000 (17:07 +0100)]
avfilter/drawutils: >8 bit support

Signed-off-by: Paul B Mahol <onemda@gmail.com>
4 years agoMerge commit 'bd49be885e9ad6bae599c54473ba2fa2957eb140'
Derek Buitenhuis [Wed, 17 Feb 2016 16:46:44 +0000 (16:46 +0000)]
Merge commit 'bd49be885e9ad6bae599c54473ba2fa2957eb140'

* commit 'bd49be885e9ad6bae599c54473ba2fa2957eb140':
  avconv_vdpau: use the hwcontext API to simplify code

Tested-by: wm4
Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
4 years agoMerge commit 'a001ce31bc2bcf875a39b5fb22dae49120293b42'
Derek Buitenhuis [Wed, 17 Feb 2016 16:16:34 +0000 (16:16 +0000)]
Merge commit 'a001ce31bc2bcf875a39b5fb22dae49120293b42'

* commit 'a001ce31bc2bcf875a39b5fb22dae49120293b42':
  hwcontext: add a VDPAU implementation

Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
4 years agoMerge commit '89923e418b494e337683442ab896d754bc07341a'
Derek Buitenhuis [Wed, 17 Feb 2016 16:10:53 +0000 (16:10 +0000)]
Merge commit '89923e418b494e337683442ab896d754bc07341a'

* commit '89923e418b494e337683442ab896d754bc07341a':
  lavu: add a framework for handling hwaccel frames

Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
4 years agoMerge commit '721a4efc0545548a241080b53ab480e34f366240'
Derek Buitenhuis [Wed, 17 Feb 2016 16:07:16 +0000 (16:07 +0000)]
Merge commit '721a4efc0545548a241080b53ab480e34f366240'

* commit '721a4efc0545548a241080b53ab480e34f366240':
  buffer: add support for pools using caller data in allocation

Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
4 years agoMerge commit 'c084d6d2cfb570b10d8784eb20cc696dfb7c5605'
Derek Buitenhuis [Wed, 17 Feb 2016 15:42:12 +0000 (15:42 +0000)]
Merge commit 'c084d6d2cfb570b10d8784eb20cc696dfb7c5605'

* commit 'c084d6d2cfb570b10d8784eb20cc696dfb7c5605':
  buffersrc: default SAR to 0 (unknown) rather than 1

Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
4 years agoMerge commit 'a2bb771a3cded8a05137c0effb34f61a2bc78e22'
Derek Buitenhuis [Wed, 17 Feb 2016 15:39:27 +0000 (15:39 +0000)]
Merge commit 'a2bb771a3cded8a05137c0effb34f61a2bc78e22'

* commit 'a2bb771a3cded8a05137c0effb34f61a2bc78e22':
  configure: Restore the --enable-everything behaviour

Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
4 years agoMerge commit '5e1beec944dacd6b4ed7d710125dd508c41ca969'
Derek Buitenhuis [Wed, 17 Feb 2016 15:30:44 +0000 (15:30 +0000)]
Merge commit '5e1beec944dacd6b4ed7d710125dd508c41ca969'

* commit '5e1beec944dacd6b4ed7d710125dd508c41ca969':
  configure: Print which libraries will be built

Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
4 years agoMerge commit '21c750f240b9d0c41a258d1adee2d9f75ff378b6'
Derek Buitenhuis [Wed, 17 Feb 2016 15:27:50 +0000 (15:27 +0000)]
Merge commit '21c750f240b9d0c41a258d1adee2d9f75ff378b6'

* commit '21c750f240b9d0c41a258d1adee2d9f75ff378b6':
  configure: Use `require` for the non-component options

Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
4 years agoRevert "configure: Revert recent changes to disable-everything"
Derek Buitenhuis [Wed, 17 Feb 2016 15:27:11 +0000 (15:27 +0000)]
Revert "configure: Revert recent changes to disable-everything"

Following merges make it work as before.

This reverts commit cefad29df93ab88ebab584e6ee151d5339d9329f.

Signed-off-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
4 years agohlsenc: add use_localtime_mkdir option to automatically create time-based directory
Johan Ström [Wed, 3 Feb 2016 21:20:07 +0000 (22:20 +0100)]
hlsenc: add use_localtime_mkdir option to automatically create time-based directory

Use with -use_localtime, and set -hls_segment_filename to a path which
contains a subdirectory i.e. /some/path/%Y%m%d/%Y%m%dT%H%M%S-%s.ts
This will mkdir the %Y%m%d-part of the path if it does not already
exist.
In addition, each filename in the playlist output will be prefixed with
this subdirectory (if playlist and segment shares the same base path).

Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
4 years agoavfilter/avf_showcqt: improve pts handling
Muhammad Faiz [Tue, 16 Feb 2016 00:03:37 +0000 (07:03 +0700)]
avfilter/avf_showcqt: improve pts handling

correct output pts based on input pts
make seeking possible
output frame one by one on eof
tested with showinfo filter

Suggested-by: Paul B Mahol <onemda@gmail.com>
Reviewed-by: Paul B Mahol <onemda@gmail.com>
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
4 years agoavcodec/eatqi: print error on mb decode failure
Michael Niedermayer [Wed, 17 Feb 2016 02:53:38 +0000 (03:53 +0100)]
avcodec/eatqi: print error on mb decode failure

Reviewed-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
4 years agoavfilter/vf_drawbox: reindent
Paul B Mahol [Wed, 17 Feb 2016 08:42:46 +0000 (09:42 +0100)]
avfilter/vf_drawbox: reindent

Signed-off-by: Paul B Mahol <onemda@gmail.com>
4 years agoavfilter/vf_drawbox: add alpha pixel formats support
Paul B Mahol [Mon, 15 Feb 2016 10:38:22 +0000 (11:38 +0100)]
avfilter/vf_drawbox: add alpha pixel formats support

Signed-off-by: Paul B Mahol <onemda@gmail.com>
4 years agoswscale/x86/output: Fix yuv2planeX_16* with unaligned destination
Michael Niedermayer [Tue, 16 Feb 2016 23:14:56 +0000 (00:14 +0100)]
swscale/x86/output: Fix yuv2planeX_16* with unaligned destination

Reviewed-by: BBB
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
4 years agoswscale/x86/output: Move code into yuv2planeX_mainloop
Michael Niedermayer [Wed, 17 Feb 2016 03:15:29 +0000 (04:15 +0100)]
swscale/x86/output: Move code into yuv2planeX_mainloop

Reviewed-by: BBB
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
4 years agoavcodec/mpeg12: Remove duplicate block_last_index setting code
Michael Niedermayer [Tue, 16 Feb 2016 20:36:29 +0000 (21:36 +0100)]
avcodec/mpeg12: Remove duplicate block_last_index setting code

Based on 7c25ffe070c286874a8c3513f7504b90e1626b0c and 58dd885f9ae7feee002773253e345e11e7142739

Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
4 years agoavcodec/mpeg12: Fix error return
Michael Niedermayer [Tue, 16 Feb 2016 20:26:54 +0000 (21:26 +0100)]
avcodec/mpeg12: Fix error return

Also remove a tab

Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
4 years agoavformat/hls: fix potential integer overflow
Michael Niedermayer [Tue, 16 Feb 2016 16:54:55 +0000 (17:54 +0100)]
avformat/hls: fix potential integer overflow

This is not a regression

Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
4 years agomov: Fix leftover merge conflict cruft
Derek Buitenhuis [Tue, 16 Feb 2016 20:09:56 +0000 (20:09 +0000)]
mov: Fix leftover merge conflict cruft

Signed-off-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
4 years agoMerge commit '5eb562831b3a9bea8026c413ef1338e06450d005'
Derek Buitenhuis [Tue, 16 Feb 2016 20:07:08 +0000 (20:07 +0000)]
Merge commit '5eb562831b3a9bea8026c413ef1338e06450d005'

This commit is a no-op.

* commit '5eb562831b3a9bea8026c413ef1338e06450d005':
  mov: Use the correct type for size

Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
4 years agoMerge commit '8d34a2f803c9ca9433b5a51bacbbe352e8d327e2'
Derek Buitenhuis [Tue, 16 Feb 2016 20:05:28 +0000 (20:05 +0000)]
Merge commit '8d34a2f803c9ca9433b5a51bacbbe352e8d327e2'

* commit '8d34a2f803c9ca9433b5a51bacbbe352e8d327e2':
  vdpau: Support for VDPAU accelerated HEVC decoding

Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
4 years agoMerge commit '8958c5c64d05453204642b55a7b8b44c93023b17'
Derek Buitenhuis [Tue, 16 Feb 2016 19:53:50 +0000 (19:53 +0000)]
Merge commit '8958c5c64d05453204642b55a7b8b44c93023b17'

This commit is a no-op.

* commit '8958c5c64d05453204642b55a7b8b44c93023b17':
  hevc: Track long and short term RPS size for VDPAU

Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
4 years agoMerge commit '8c399bd5cefd572eceb448981fcb6d4dbca35d27'
Derek Buitenhuis [Tue, 16 Feb 2016 19:52:17 +0000 (19:52 +0000)]
Merge commit '8c399bd5cefd572eceb448981fcb6d4dbca35d27'

This commit is a no-op.

* commit '8c399bd5cefd572eceb448981fcb6d4dbca35d27':
  dxva2_hevc: properly signal the num_delta_pocs from the SPS RPS

Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
4 years agoMerge commit 'e579d8b29cdb9b42c50a0fde277dfb047c1466ad'
Derek Buitenhuis [Tue, 16 Feb 2016 19:51:02 +0000 (19:51 +0000)]
Merge commit 'e579d8b29cdb9b42c50a0fde277dfb047c1466ad'

* commit 'e579d8b29cdb9b42c50a0fde277dfb047c1466ad':
  lavf: Dump the cpb side data information

Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
4 years agoMerge commit 'd005ccc630e42daab8ec2afecf972d1551a9401a'
Derek Buitenhuis [Tue, 16 Feb 2016 19:49:51 +0000 (19:49 +0000)]
Merge commit 'd005ccc630e42daab8ec2afecf972d1551a9401a'

This commit is a no-op. Ours should be superior.

* commit 'd005ccc630e42daab8ec2afecf972d1551a9401a':
  nvenc: rename a misnamed function
  nvenc: merge input and output surface structs
  nvenc: factor out the pixel format list

Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
4 years agoMerge commit 'fb25d99b0a5e21fb8cc184c7a9d3736387778266'
Derek Buitenhuis [Tue, 16 Feb 2016 19:48:39 +0000 (19:48 +0000)]
Merge commit 'fb25d99b0a5e21fb8cc184c7a9d3736387778266'

This commit is a no-op.

* commit 'fb25d99b0a5e21fb8cc184c7a9d3736387778266':
  buffersrc: do not discard the error from ff_filter_frame()

Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
4 years agoMerge commit 'f7d77b9a5dd42bf0f5dffecf590466b4c4239437'
Derek Buitenhuis [Tue, 16 Feb 2016 19:40:06 +0000 (19:40 +0000)]
Merge commit 'f7d77b9a5dd42bf0f5dffecf590466b4c4239437'

* commit 'f7d77b9a5dd42bf0f5dffecf590466b4c4239437':
  eatqi: Remove MpegEncContext dependency

Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
4 years agoMerge commit '7c25ffe070c286874a8c3513f7504b90e1626b0c'
Derek Buitenhuis [Tue, 16 Feb 2016 19:19:23 +0000 (19:19 +0000)]
Merge commit '7c25ffe070c286874a8c3513f7504b90e1626b0c'

* commit '7c25ffe070c286874a8c3513f7504b90e1626b0c':
  mpeg1: Make intra-block decoding independent of MpegEncContext

Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
4 years agoMerge commit '249827f736db4c94dfcb24a3883aa4c04f9b119b'
Derek Buitenhuis [Tue, 16 Feb 2016 19:05:26 +0000 (19:05 +0000)]
Merge commit '249827f736db4c94dfcb24a3883aa4c04f9b119b'

* commit '249827f736db4c94dfcb24a3883aa4c04f9b119b':
  mpeg12dec: Refactor mpeg1_decode_block_intra()

Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
4 years agoMerge commit 'cdbaa436042ba59c3b2bd7e9652e9a14136fd604'
Derek Buitenhuis [Tue, 16 Feb 2016 18:57:41 +0000 (18:57 +0000)]
Merge commit 'cdbaa436042ba59c3b2bd7e9652e9a14136fd604'

* commit 'cdbaa436042ba59c3b2bd7e9652e9a14136fd604':
  mpeg12dec: Always close reader on error

Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
4 years agoavfilter/f_streamselect: check if map is available
Paul B Mahol [Tue, 16 Feb 2016 17:14:55 +0000 (18:14 +0100)]
avfilter/f_streamselect: check if map is available

Signed-off-by: Paul B Mahol <onemda@gmail.com>
4 years agoMerge commit '7a00653be6b13131ce1b2cdeca696429f57caaf8'
Derek Buitenhuis [Tue, 16 Feb 2016 18:11:05 +0000 (18:11 +0000)]
Merge commit '7a00653be6b13131ce1b2cdeca696429f57caaf8'

* commit '7a00653be6b13131ce1b2cdeca696429f57caaf8':
  tiny_psnr: Support large files

Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
4 years agodoc/filters: remove redundant example
Lou Logan [Tue, 16 Feb 2016 17:49:49 +0000 (08:49 -0900)]
doc/filters: remove redundant example

Newer example in blend from f80b475 is faster and simpler.

Signed-off-by: Lou Logan <lou@lrcd.com>
4 years agoMerge commit '99214d42a902c8392d7887c08fdc5dc1fc2475ae'
Derek Buitenhuis [Tue, 16 Feb 2016 17:48:30 +0000 (17:48 +0000)]
Merge commit '99214d42a902c8392d7887c08fdc5dc1fc2475ae'

This commit is a no-op. FFmpeg already has this.

* commit '99214d42a902c8392d7887c08fdc5dc1fc2475ae':
  dnxhd: Make the encoder message friendlier

Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
4 years agoMerge commit '34c9eba982c75196392a3b0b245dd34297c4511d'
Derek Buitenhuis [Tue, 16 Feb 2016 17:44:33 +0000 (17:44 +0000)]
Merge commit '34c9eba982c75196392a3b0b245dd34297c4511d'

* commit '34c9eba982c75196392a3b0b245dd34297c4511d':
  configure: Refactor toolchain flag setting

Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
4 years agoMerge commit 'dd53af4b37c7790ce26065b36d5655c1af38b295'
Derek Buitenhuis [Tue, 16 Feb 2016 17:40:08 +0000 (17:40 +0000)]
Merge commit 'dd53af4b37c7790ce26065b36d5655c1af38b295'

This commit is a no-op. I don't want to enrange Certain People
who like to --disable-*.

* commit 'dd53af4b37c7790ce26065b36d5655c1af38b295':
  avplay: drop support for building without lavfi

Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
4 years agoMerge commit '5781bfae0cf4271278a8bea176d615cb5c222335'
Derek Buitenhuis [Tue, 16 Feb 2016 17:37:47 +0000 (17:37 +0000)]
Merge commit '5781bfae0cf4271278a8bea176d615cb5c222335'

This commit is a no-op.

* commit '5781bfae0cf4271278a8bea176d615cb5c222335':
  flacenc: Load default prediction_order parameters if none is selected
  asfdec: make sure packet_size is non-zero before seeking
  asfdec: check for too small size in asf_read_unknown
  asfdec: check avio_skip in asf_read_simple_index
  asfdec: break if EOF is reached after asf_read_packet_header

Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
4 years agoMerge commit '389b79842c67b1f5730215a752a5f89cb1b8d9a3'
Derek Buitenhuis [Tue, 16 Feb 2016 17:34:24 +0000 (17:34 +0000)]
Merge commit '389b79842c67b1f5730215a752a5f89cb1b8d9a3'

This commit is a no-op.

* commit '389b79842c67b1f5730215a752a5f89cb1b8d9a3':
  msvc: Fix libx264 linking
  doc: Improve the channelsplit example
  configure: Support MSYS2 mingw-w64 64bit

Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
4 years agoMerge commit 'e280fe13291e9c712a5f4aa13b5263f3e8afed45'
Derek Buitenhuis [Tue, 16 Feb 2016 17:23:32 +0000 (17:23 +0000)]
Merge commit 'e280fe13291e9c712a5f4aa13b5263f3e8afed45'

* commit 'e280fe13291e9c712a5f4aa13b5263f3e8afed45':
  v210: Use separate sample_factors

Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
4 years agoMerge commit '15ec7aa4170ed05ad1b17000ef1e3940d0a0c5e7'
Derek Buitenhuis [Tue, 16 Feb 2016 17:21:29 +0000 (17:21 +0000)]
Merge commit '15ec7aa4170ed05ad1b17000ef1e3940d0a0c5e7'

This commit is a no-op.

* commit '15ec7aa4170ed05ad1b17000ef1e3940d0a0c5e7':
  v210: Add avx2 version of the 10-bit line encoder
  v210: Add avx2 version of the 8-bit line encoder

Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
4 years agoMerge commit '1ba1fede9dfe03dc48862e5e0530cca7192f5038'
Derek Buitenhuis [Tue, 16 Feb 2016 17:12:00 +0000 (17:12 +0000)]
Merge commit '1ba1fede9dfe03dc48862e5e0530cca7192f5038'

This commit is a no-op.

* commit '1ba1fede9dfe03dc48862e5e0530cca7192f5038':
  flacenc: Restore defaults and range for {min, max}_prediction_order

Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
4 years agoMerge commit '60f0fde3092d18d4d36555962c192af8691a099c'
Derek Buitenhuis [Tue, 16 Feb 2016 17:06:36 +0000 (17:06 +0000)]
Merge commit '60f0fde3092d18d4d36555962c192af8691a099c'

This commit is a no-op.

* commit '60f0fde3092d18d4d36555962c192af8691a099c':
  libx264: Make sure to preserve default option values

Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
4 years agoMerge commit '77a44f577b644a328dcf90cde11d2ecae69eda05'
Derek Buitenhuis [Tue, 16 Feb 2016 17:03:30 +0000 (17:03 +0000)]
Merge commit '77a44f577b644a328dcf90cde11d2ecae69eda05'

This commit is a no-op.

* commit '77a44f577b644a328dcf90cde11d2ecae69eda05':
  configure: add missing avx2 support check
  x86: Add ymm_reg struct

Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
4 years agoMerge commit 'eafb05fcf37cd19a910ca3b17824384f9006bc0a'
Derek Buitenhuis [Tue, 16 Feb 2016 17:02:03 +0000 (17:02 +0000)]
Merge commit 'eafb05fcf37cd19a910ca3b17824384f9006bc0a'

* commit 'eafb05fcf37cd19a910ca3b17824384f9006bc0a':
  v210: x86: Add the correct guards around the asm code

Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
4 years agoMerge commit '4709f72115e4028a1cb43e916925678bfceef870'
Derek Buitenhuis [Tue, 16 Feb 2016 17:00:37 +0000 (17:00 +0000)]
Merge commit '4709f72115e4028a1cb43e916925678bfceef870'

This commit is a no-op.

* commit '4709f72115e4028a1cb43e916925678bfceef870':
  lavfi: Use AV_CEIL_RSHIFT where needed

Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
4 years agoMerge commit 'e80307140f736f593ee643affa015333d7c5e27f'
Derek Buitenhuis [Tue, 16 Feb 2016 16:57:32 +0000 (16:57 +0000)]
Merge commit 'e80307140f736f593ee643affa015333d7c5e27f'

* commit 'e80307140f736f593ee643affa015333d7c5e27f':
  yuv4mpegenc: Use AV_CEIL_RSHIFT where needed

Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
4 years agoMerge commit '6695f178a5929eab91d3da7e9023999f1774bd0e'
Derek Buitenhuis [Tue, 16 Feb 2016 16:55:28 +0000 (16:55 +0000)]
Merge commit '6695f178a5929eab91d3da7e9023999f1774bd0e'

* commit '6695f178a5929eab91d3da7e9023999f1774bd0e':
  pixdesc: Use AV_CEIL_RSHIFT in documentation

Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
4 years agoMerge commit '1546a41adae818b340acdd9b5dacd6d0a92b6507'
Derek Buitenhuis [Tue, 16 Feb 2016 16:52:45 +0000 (16:52 +0000)]
Merge commit '1546a41adae818b340acdd9b5dacd6d0a92b6507'

* commit '1546a41adae818b340acdd9b5dacd6d0a92b6507':
  pixdesc: Drop unneeded deprecation warning guards

Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
4 years agoMerge commit '9cac1b4b4f1532fb2aeef54799285360656be5eb'
Derek Buitenhuis [Tue, 16 Feb 2016 16:51:45 +0000 (16:51 +0000)]
Merge commit '9cac1b4b4f1532fb2aeef54799285360656be5eb'

* commit '9cac1b4b4f1532fb2aeef54799285360656be5eb':
  qsvenc: Add private option to replace coder_type

Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
4 years agoMerge commit 'eef9f06508354d1c7d5624c1c18997e7974288f1'
Derek Buitenhuis [Tue, 16 Feb 2016 16:49:19 +0000 (16:49 +0000)]
Merge commit 'eef9f06508354d1c7d5624c1c18997e7974288f1'

This commit is a no-nop.

* commit 'eef9f06508354d1c7d5624c1c18997e7974288f1':
  avplay: Allow to override the codec
  avplay: Statically allocate the player state
  avplay: Rename cur_stream to player
  avplay: Rename VideoState to PlayerState
  avplay: Allocate the refresh thread next to the decode thread
  avplay: Move the stream setup in the main thread

Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
4 years agoMerge commit '81306fd4bdeb5c17d4db771e4fec684773b5790f'
Derek Buitenhuis [Tue, 16 Feb 2016 16:26:49 +0000 (16:26 +0000)]
Merge commit '81306fd4bdeb5c17d4db771e4fec684773b5790f'

* commit '81306fd4bdeb5c17d4db771e4fec684773b5790f':
  hls: eliminate ffurl_* usage

Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
4 years agoavfilter: add fieldhint filter
Paul B Mahol [Sun, 14 Feb 2016 18:02:42 +0000 (19:02 +0100)]
avfilter: add fieldhint filter

Signed-off-by: Paul B Mahol <onemda@gmail.com>
4 years agoswscale/slice: Actually use the buffers' strides
Derek Buitenhuis [Fri, 12 Feb 2016 18:04:34 +0000 (18:04 +0000)]
swscale/slice: Actually use the buffers' strides

Signed-off-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
4 years agolavc/rawdec: Retrieve nut palette from packets
Mats Peterson [Tue, 16 Feb 2016 10:44:50 +0000 (11:44 +0100)]
lavc/rawdec: Retrieve nut palette from packets

Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
4 years agolavfi/elbg: Make the pal8 output opaque.
Carl Eugen Hoyos [Tue, 16 Feb 2016 08:16:32 +0000 (09:16 +0100)]
lavfi/elbg: Make the pal8 output opaque.

4 years agovc2enc: print the average quantization index at the end
Rostislav Pehlivanov [Mon, 15 Feb 2016 23:54:52 +0000 (23:54 +0000)]
vc2enc: print the average quantization index at the end

Similar to how the AAC encoder does it.
0 means the video's been compressed losslessly/almost losslessly
thoughout. Generally, the higher, the worse.

Signed-off-by: Rostislav Pehlivanov <atomnuker@gmail.com>
4 years agoRELEASE: Update to 3.0.git
Timothy Gu [Mon, 15 Feb 2016 18:20:33 +0000 (10:20 -0800)]
RELEASE: Update to 3.0.git

4 years agoMAINTAINERS: add myself as an OS/2 maintainer
KO Myung-Hun [Mon, 15 Feb 2016 04:16:23 +0000 (13:16 +0900)]
MAINTAINERS: add myself as an OS/2 maintainer

Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
4 years agovc2enc: fix use of uninitialized variables in the rate control system
Rostislav Pehlivanov [Mon, 15 Feb 2016 12:08:11 +0000 (12:08 +0000)]
vc2enc: fix use of uninitialized variables in the rate control system

Fixes: CID1352550
Fixes: CID1352549

Signed-off-by: Rostislav Pehlivanov <atomnuker@gmail.com>
4 years agoffmpeg_dxva2: add a profile check for hevc
Hendrik Leppkes [Sat, 30 Jan 2016 16:11:13 +0000 (17:11 +0100)]
ffmpeg_dxva2: add a profile check for hevc

4 years agoffmpeg_dxva2: support hevc main10 decoding
Hendrik Leppkes [Sat, 30 Jan 2016 16:11:06 +0000 (17:11 +0100)]
ffmpeg_dxva2: support hevc main10 decoding

4 years agohevc: support Main10 decoding through dxva2
Hendrik Leppkes [Sat, 30 Jan 2016 16:10:56 +0000 (17:10 +0100)]
hevc: support Main10 decoding through dxva2

4 years agofate/source-check.sh: Use "git show" instead of git --version to test for git
Michael Niedermayer [Mon, 15 Feb 2016 02:40:32 +0000 (03:40 +0100)]
fate/source-check.sh: Use "git show" instead of git --version to test for git

This fixes fate with non git source trees

Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
4 years agolavd/gdigrab: mouse dpi awareness
Metaksakis Georgios [Sun, 14 Feb 2016 23:05:17 +0000 (10:05 +1100)]
lavd/gdigrab: mouse dpi awareness

correct mouse location on hidpi screens.
fixes ticket #5008

Signed-off-by: Matt Oliver <protogonoi@gmail.com>
4 years agox86: use the new helper macros where useful
James Almer [Sun, 7 Feb 2016 03:52:06 +0000 (00:52 -0300)]
x86: use the new helper macros where useful

Reviewed-by: Michael Niedermayer <michael@niedermayer.cc>
Signed-off-by: James Almer <jamrial@gmail.com>
4 years agox86: add some more helper macros to check for slow cpuflags
James Almer [Sun, 7 Feb 2016 03:29:43 +0000 (00:29 -0300)]
x86: add some more helper macros to check for slow cpuflags

Reviewed-by: Michael Niedermayer <michael@niedermayer.cc>
Signed-off-by: James Almer <jamrial@gmail.com>
4 years agoChangelog: add entries for the SMPTE VC-2 decoder and encoder n3.1-dev
Rostislav Pehlivanov [Sun, 14 Feb 2016 21:59:50 +0000 (21:59 +0000)]
Changelog: add entries for the SMPTE VC-2 decoder and encoder

Signed-off-by: Rostislav Pehlivanov <atomnuker@gmail.com>
4 years agoChangelog/APIChanges Put 3.0 release marker
Michael Niedermayer [Sun, 14 Feb 2016 20:34:08 +0000 (21:34 +0100)]
Changelog/APIChanges Put 3.0 release marker

Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
4 years agoavconv_vdpau: use the hwcontext API to simplify code
Anton Khirnov [Tue, 2 Feb 2016 10:21:36 +0000 (11:21 +0100)]
avconv_vdpau: use the hwcontext API to simplify code

4 years agohwcontext: add a VDPAU implementation
Anton Khirnov [Mon, 7 Dec 2015 14:04:57 +0000 (15:04 +0100)]
hwcontext: add a VDPAU implementation

4 years agolavu: add a framework for handling hwaccel frames
Anton Khirnov [Fri, 20 Nov 2015 18:47:29 +0000 (19:47 +0100)]
lavu: add a framework for handling hwaccel frames

4 years agoavformat/img2enc: remove unused variable
Michael Niedermayer [Sun, 14 Feb 2016 20:30:53 +0000 (21:30 +0100)]
avformat/img2enc: remove unused variable

Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
4 years agoavutil/imgutils: remove special case for aligning the palette
Michael Niedermayer [Sun, 14 Feb 2016 14:22:47 +0000 (15:22 +0100)]
avutil/imgutils: remove special case for aligning the palette

This was suggested by wm4 and stefano.
After this patch using align=1 the size used by various functions would not
contain padding, while the palette would be aligned at align>1

This patch makes it required to use align>=4 if the palette is to be accessed
as uint32

As a side-effect It fixes storing pal8 in nut with odd with&height

Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
4 years agobuffer: add support for pools using caller data in allocation
Anton Khirnov [Sat, 9 Jan 2016 08:25:32 +0000 (09:25 +0100)]
buffer: add support for pools using caller data in allocation

This should allow using more complex allocators than simple malloc
wrappers.

4 years agobuffersrc: default SAR to 0 (unknown) rather than 1
Anton Khirnov [Fri, 12 Feb 2016 08:21:00 +0000 (09:21 +0100)]
buffersrc: default SAR to 0 (unknown) rather than 1

It makes more sense to not claim anything about the SAR if we don't know
anything. No changes in the FATE tests, since this is what avconv ends
up doing anyway.

4 years agodoc/protocols: document protocol_whitelist
Michael Niedermayer [Thu, 11 Feb 2016 12:11:48 +0000 (13:11 +0100)]
doc/protocols: document protocol_whitelist

Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
4 years agoavcodec/h264_cabac: Check decode_cabac_mb_mvd() for failure
Michael Niedermayer [Tue, 26 Jan 2016 01:23:31 +0000 (02:23 +0100)]
avcodec/h264_cabac: Check decode_cabac_mb_mvd() for failure

Fixes harmless integer overflow
Fixes Ticket5150

No speedloss measured, actually its slightly faster, but please benchmark & double check this

Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
4 years agoavformat/genh: Mark coef_splitted as av_unused
Michael Niedermayer [Sun, 18 Oct 2015 18:31:27 +0000 (20:31 +0200)]
avformat/genh: Mark coef_splitted as av_unused

This avoid "libavformat/genh.c:43:14: warning: variable coef_splitted set but not used"
Fewer warnings makes it easier to see new and important warnings

Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
4 years agoavutil/parseutils: remove 2112 date from fate test
Marton Balint [Sun, 14 Feb 2016 12:33:14 +0000 (13:33 +0100)]
avutil/parseutils: remove 2112 date from fate test

It is not supported on 32bit.

Signed-off-by: Marton Balint <cus@passwd.hu>
4 years agox86/vc1dsp: Port vc1_*_hor_16b_shift2 to NASM format
Timothy Gu [Sun, 14 Feb 2016 04:22:48 +0000 (04:22 +0000)]
x86/vc1dsp: Port vc1_*_hor_16b_shift2 to NASM format

Reviewed-by: Christophe Gisquet <christophe.gisquet@gmail.com>
4 years agocheckasm/vf_blend: Decrease iteration count
Timothy Gu [Sun, 14 Feb 2016 18:48:24 +0000 (10:48 -0800)]
checkasm/vf_blend: Decrease iteration count

The test is already slow.

4 years agocheckasm: Add vf_blend tests
Timothy Gu [Wed, 10 Feb 2016 09:07:40 +0000 (09:07 +0000)]
checkasm: Add vf_blend tests

4 years agovf_blend: Move C dsp function mapping to separate function
Timothy Gu [Wed, 10 Feb 2016 09:05:30 +0000 (09:05 +0000)]
vf_blend: Move C dsp function mapping to separate function

4 years agolibavcodec/dnxhd_parser: add parser and probe support raw 444 and dnxhr formats
Mark Reid [Sun, 14 Feb 2016 05:44:32 +0000 (21:44 -0800)]
libavcodec/dnxhd_parser: add parser and probe support raw 444 and dnxhr formats

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