Merge commit 'cffecc0e7ebd642afaa1fb9f56fab1fcc283293c'

* commit 'cffecc0e7ebd642afaa1fb9f56fab1fcc283293c':
  avfilter/graphparser: Directly free filter memory if initialization fails

Conflicts:
libavfilter/graphparser.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>

avfilter/unsharp: added optimized opencl kernels

Reviewed-by: Wei Gao <highgod0401@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

Fix compilation with os2threads

Signed-off-by: Dave Yeo <daveryeo@telus.net>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

avformat/mpegvideodec: check seq headers more completely during probing

Fixes probetest failure

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

avformat/img2enc: simplify split planes extension selection.

doc/muxers: document animated GIF muxer.

avformat/gif: fix final_delay unit in documentation.

avformat/img2enc: reindent after previous commit.

avformat/image2: allow muxing gif files.

Fixes Ticket #2936.

avfilter/af_aecho: free input frame after it is being used

Signed-off-by: Paul B Mahol <onemda@gmail.com>

avcodec/libfdk-aacdec: remove redundant log messages

Signed-off-by: Paul B Mahol <onemda@gmail.com>

avcodec/hnm4video: remove redundant log message

Signed-off-by: Paul B Mahol <onemda@gmail.com>

avformat/astdec: sanity check channels & sample rate

Fixes probetest failure

Reviewed-by: Reimar Döffinger <Reimar.Doeffinger@gmx.de>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

avformat/hls: fixed bug where custom http headers weren't kept for hls streams

See: https://trac.ffmpeg.org/ticket/3024

avfilter/af_aresample: Calculate output buffer size more precisely.

Fixes accumulation of data in case of significant silence injections

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

avfilter/graphparser: Directly free filter memory if initialization fails

avformat/segafilm: check 2nd tag

Fixes probetest failure

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

avformat/swfdec: check version and size during probing

Fixes probetest failure

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

avformat/rsd: increase probe score, as misdetections are fixed

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

avformat/rsd: Check channels and sample_rate fields

Fixes probetest failure

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

avformat/libgme: decrease score by 1, fixes probetest failure

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

Merge remote-tracking branch 'cus/stable'

* cus/stable:
  ffplay: add smarter method for determining video picture duration
  ffplay: add frame duration estimated from frame rate to VideoPicture
  ffplay: avoid code duplication in AVFILTER enabled and disabled case

Merged-by: Michael Niedermayer <michaelni@gmx.at>

avutil/common: error out with clear message if __STDC_CONSTANT_MACROS is not defined with c++

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

Merge remote-tracking branch 'qatar/master'

* qatar/master:
  configure: Move -Wno-maybe-uninitialized check into gcc section

Merged-by: Michael Niedermayer <michaelni@gmx.at>

ffplay: add smarter method for determining video picture duration

- consider it an invalid PTS when the next PTS value is the same as the current one
- in case of invalid or unknown PTS, return vp->duration

This fixes ffplay part of ticket #3005.

Signed-off-by: Marton Balint <cus@passwd.hu>

ffplay: add frame duration estimated from frame rate to VideoPicture

Signed-off-by: Marton Balint <cus@passwd.hu>

ffplay: avoid code duplication in AVFILTER enabled and disabled case

Signed-off-by: Marton Balint <cus@passwd.hu>

avcodec/vp9: add ff_vp9_idct_idct_{4x4,8x8}_ssse3().

1789 decicycles in idct_idct_4x4_add_c, 262136 runs, 8 skips
1839 decicycles in idct_idct_4x4_add_c, 524270 runs, 18 skips
1864 decicycles in idct_idct_4x4_add_c, 1048548 runs, 28 skips

529 decicycles in ff_vp9_idct_idct_4x4_add_ssse3, 262138 runs, 6 skips
516 decicycles in ff_vp9_idct_idct_4x4_add_ssse3, 524282 runs, 6 skips
474 decicycles in ff_vp9_idct_idct_4x4_add_ssse3, 1048565 runs, 11 skips

(~3.9x faster)

7726 decicycles in idct_idct_8x8_add_c, 1048433 runs, 143 skips
7732 decicycles in idct_idct_8x8_add_c, 2096882 runs, 270 skips
7731 decicycles in idct_idct_8x8_add_c, 4193772 runs, 532 skips

1145 decicycles in ff_vp9_idct_idct_8x8_add_ssse3, 1048549 runs, 27 skips
1137 decicycles in ff_vp9_idct_idct_8x8_add_ssse3, 2097097 runs, 55 skips
1086 decicycles in ff_vp9_idct_idct_8x8_add_ssse3, 4194188 runs, 116 skips

(~7.1x faster)

Overall decode time before commit:
  16.48s user 0.03s system 99% cpu 16.526 total
  16.54s user 0.01s system 99% cpu 16.566 total
  16.46s user 0.03s system 99% cpu 16.511 total

Overall decode time after commit:
  16.34s user 0.02s system 99% cpu 16.378 total
  16.28s user 0.02s system 99% cpu 16.315 total
  16.32s user 0.03s system 99% cpu 16.366 total

Tested on i7 920 with 40s 1080p footage.

avfilter/opencl: compile kernels separately

Reviewed-by: Wei Gao <highgod0401@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

avutil/opencl: compile kernels separately

Reviewed-by: Wei Gao <highgod0401@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

avcodec/mss2: use init_get_bits8()

Signed-off-by: Paul B Mahol <onemda@gmail.com>

avcodec/flashsv: use av_freep() for tmpblock

Signed-off-by: Paul B Mahol <onemda@gmail.com>

avcodec/mss1: use init_get_bits8()

Signed-off-by: Paul B Mahol <onemda@gmail.com>

lsws/utils: introduce scale_algorithms array

Allow some dumb factorizations, slightly decrease spaghetti factor.

avcodec/flashsv: fix typo

Signed-off-by: Paul B Mahol <onemda@gmail.com>

avcodec/tscc2: use init_get_bits8()

Signed-off-by: Paul B Mahol <onemda@gmail.com>

avcodec/brender_pix: stop calling av_image_check_size() twice

Signed-off-by: Paul B Mahol <onemda@gmail.com>

avcodec/flashsv: stop using deprecated avcodec_set_dimensions

Signed-off-by: Paul B Mahol <onemda@gmail.com>

avcodec/flashsv: use init_get_bits8()

Signed-off-by: Paul B Mahol <onemda@gmail.com>

avcodec/brender_pix: stop using deprecated avcodec_set_dimensions

Signed-off-by: Paul B Mahol <onemda@gmail.com>

avcodec/c93: stop using deprecated avcodec_set_dimensions

Signed-off-by: Paul B Mahol <onemda@gmail.com>

configure: Move -Wno-maybe-uninitialized check into gcc section

As another example of bizarre compiler behavior clang groks the
-Wmaybe-uninitialized option, but not -Wno-maybe-uninitialized
and spews a warning for every file that gets compiled.

Merge remote-tracking branch 'qatar/master'

* qatar/master:
  avfilter/buffer: Suppress deprecation warning for avfilter_unref_buffer

Conflicts:
libavfilter/buffer.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>

Merge commit '82c86d0b1839b01b3cd0dd848fb6416ff21506dd'

* commit '82c86d0b1839b01b3cd0dd848fb6416ff21506dd':
  graph2dot: Add missing #include for av_get_channel_layout_string()

See: 1acd2f6ba7bc85d4aab6f0ebdc56c8d21785640e
Merged-by: Michael Niedermayer <michaelni@gmx.at>

Merge commit '48715285f69d70879353737d7bed049f89f58096'

* commit '48715285f69d70879353737d7bed049f89f58096':
  graph2dot: Fix use of deprecated API

See: 59360cd456dd038fb28134aff5d9b56302fff488
See: ecade984ac3ce5205f6276a9329e2b7bca09fa47
Merged-by: Michael Niedermayer <michaelni@gmx.at>

Merge commit '70cbf33405f50dfaf77e85f382a188acf17dc71a'

* commit '70cbf33405f50dfaf77e85f382a188acf17dc71a':
  vdpau: Add missing #includes to fix standalone header compilation

Conflicts:
libavcodec/vdpau_internal.h

Not completely merged as this would break use of vdpau.h from C++

Merged-by: Michael Niedermayer <michaelni@gmx.at>

Merge commit 'e2b5b097898c9155f4bdff4d83cdc54d5eef6930'

* commit 'e2b5b097898c9155f4bdff4d83cdc54d5eef6930':
  x86: rv40dsp: Use PAVGB instruction macro where appropriate

Merged-by: Michael Niedermayer <michaelni@gmx.at>

avformat/http: print http headers at AV_LOG_DEBUG level

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

lsws/utils: fix typo

lavfi/ladspa: cast return value of av_x_if_null to char*, fix warnings

avfilter/buffer: Suppress deprecation warning for avfilter_unref_buffer

The function is used in a block of code that is deprecated anyway.

graph2dot: Add missing #include for av_get_channel_layout_string()

graph2dot: Fix use of deprecated API

vdpau: Add missing #includes to fix standalone header compilation

Signed-off-by: Anton Khirnov <anton@khirnov.net>

Merge remote-tracking branch 'qatar/master'

* qatar/master:
  omadec: loosen format probing constraints

Merged-by: Michael Niedermayer <michaelni@gmx.at>

Merge commit '1c736bedd9891501960ebac0f7c05eb60225e947'

* commit '1c736bedd9891501960ebac0f7c05eb60225e947':
  omadec: check GEOB sizes against buffer size

Conflicts:
libavformat/omadec.c

See: e74fa25cb9f29aee8a36df0c8e492f8bafdbe4a0
See: 91e72e35141f590c38985ad0ae3453a4e9e86b8a
Merged-by: Michael Niedermayer <michaelni@gmx.at>

Merge commit '97f50e92b5cf3b47a76f75d76ed4340e822030db'

* commit '97f50e92b5cf3b47a76f75d76ed4340e822030db':
  omadec: Fix wrong number of array elements

See: 4f5d1468f55eb87bce84845c4e62242c791268f5
Merged-by: Michael Niedermayer <michaelni@gmx.at>

Merge commit 'e73996954d8e00117056dcefb38ef3d4d2f37967'

* commit 'e73996954d8e00117056dcefb38ef3d4d2f37967':
  filtfmts-test: Fix use of deprecated API

Conflicts:
libavfilter/filtfmts.c

See: f12174c8cef872030a156cbf252f4951c3a6357c
Merged-by: Michael Niedermayer <michaelni@gmx.at>

Merge commit '3ef9b7ab95cc703b67a8b658dca45c80df0aaa66'

* commit '3ef9b7ab95cc703b67a8b658dca45c80df0aaa66':
  hevc_ps: Use AV_PIX_FMT_YUVJ420P if YUV 4:2:0 8-bit full scale

Merged-by: Michael Niedermayer <michaelni@gmx.at>

Merge commit '885ec9242554ad25922258a595ec5e317922a412'

* commit '885ec9242554ad25922258a595ec5e317922a412':
  hevc: Use parsed VUI colorimetry in avcodec

Merged-by: Michael Niedermayer <michaelni@gmx.at>

Merge commit 'cd8f772d0678a90957f4dfd5ce51af9d22e3f212'

* commit 'cd8f772d0678a90957f4dfd5ce51af9d22e3f212':
  lavc: Add colorimetry values for BT.2020, other non-included ones

Conflicts:
doc/APIchanges
libavcodec/avcodec.h
libavcodec/version.h

Merged-by: Michael Niedermayer <michaelni@gmx.at>

Merge commit '446e37dc97e533e37f6aa0a11355124207e3a7f7'

* commit '446e37dc97e533e37f6aa0a11355124207e3a7f7':
  vf_fieldorder: remove superfluous get_video_buffer

Conflicts:
libavfilter/vf_fieldorder.c

See: 9b35bee696739eb6774bdba30504c51132e2a934
Merged-by: Michael Niedermayer <michaelni@gmx.at>

x86: rv40dsp: Use PAVGB instruction macro where appropriate

omadec: loosen format probing constraints

Imporoves detection of some files in the wild:

- ID3v2 a.k.a. "ea3" header is optional.
- Version and flags in ID3v2 header are unspecified.

Signed-off-by: David Goldwich <david.goldwich@gmail.com>
Signed-off-by: Anton Khirnov <anton@khirnov.net>

omadec: check GEOB sizes against buffer size

Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: David Goldwich <david.goldwich@gmail.com>
CC:libav-stable@libav.org
Signed-off-by: Anton Khirnov <anton@khirnov.net>

omadec: Fix wrong number of array elements

Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: David Goldwich <david.goldwich@gmail.com>
CC:libav-stable@libav.org
Signed-off-by: Anton Khirnov <anton@khirnov.net>

filtfmts-test: Fix use of deprecated API

Signed-off-by: Vittorio Giovara <vittorio.giovara@gmail.com>

hevc_ps: Use AV_PIX_FMT_YUVJ420P if YUV 4:2:0 8-bit full scale

Signed-off-by: Vittorio Giovara <vittorio.giovara@gmail.com>

hevc: Use parsed VUI colorimetry in avcodec

Also limit the parsed VUI values to known valid ones.

Signed-off-by: Vittorio Giovara <vittorio.giovara@gmail.com>

lavc: Add colorimetry values for BT.2020, other non-included ones

Signed-off-by: Vittorio Giovara <vittorio.giovara@gmail.com>

avutil: add av_fopen_utf8()

fopen() on windows uses UTF-16, we use UTF-8 everywhere, this
function bridges the gap by using avpriv_open()

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

avfilter/vf_scale: add ov/hsub

Suggested-by: divVerent
Reviewed-by: Stefano
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

vf_fieldorder: remove superfluous get_video_buffer

doc/examples: rename demuxing to demuxing_decoding.

That example shows how the decoding process works, not only the
demuxing.

doc/examples/demuxing: show how to use the reference counting system.

Merge remote-tracking branch 'qatar/master'

* qatar/master:
  aacdec: Set the profile during decoding

Merged-by: Michael Niedermayer <michaelni@gmx.at>

Merge commit 'da6506c607eda585ba4b15430cf3c9a2ce09c3a9'

* commit 'da6506c607eda585ba4b15430cf3c9a2ce09c3a9':
  lavc: move AVCodecContext.pkt to AVCodecInternal

Conflicts:
libavcodec/internal.h
libavcodec/rawdec.c
libavcodec/utils.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>

Merge commit '38ecc3702dabbea09230f6d6333f59e74f5d1c12'

* commit '38ecc3702dabbea09230f6d6333f59e74f5d1c12':
  pthread: store thread contexts in AVCodecInternal instead of AVCodecContext

Conflicts:
libavcodec/internal.h
libavcodec/utils.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>

Merge commit 'daa7a1d4431b6acf1f93c4a98b3de123abf4ca18'

* commit 'daa7a1d4431b6acf1f93c4a98b3de123abf4ca18':
  pthread_slice: rename ThreadContext -> SliceThreadContext

Conflicts:
libavcodec/pthread_slice.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>

Merge commit 'cc14ee03a7b91c69343f8d60c9e089a1950eeadb'

* commit 'cc14ee03a7b91c69343f8d60c9e089a1950eeadb':
  lavc: split slice and frame threading functions into separate files

Conflicts:
libavcodec/Makefile
libavcodec/pthread.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>

Merge commit '5cd6513f5be14b9744783d3d9e853d3f11065e93'

* commit '5cd6513f5be14b9744783d3d9e853d3f11065e93':
  pthread: drop avcodec_ prefixes from static functions

Merged-by: Michael Niedermayer <michaelni@gmx.at>

Merge commit '694d997afe07ec619e61e1c614733796dd01a52b'

* commit '694d997afe07ec619e61e1c614733796dd01a52b':
  x86: hpeldsp: Use PAVGB instruction macro where necessary

See: 074155360d28d25701e0cbc7e867bda0e08d9428
Merged-by: Michael Niedermayer <michaelni@gmx.at>

aacdec: Set the profile during decoding

Previously the profile would not be set if the bitstream needs
to be decoded to know the profile.

Signed-off-by: Anton Khirnov <anton@khirnov.net>

lavc: move AVCodecContext.pkt to AVCodecInternal

It's a private field, not meant to be accessed from outside lavc.

pthread: store thread contexts in AVCodecInternal instead of AVCodecContext

It's a private field, it should not be visible to callers.

Deprecate AVCodecContext.thread_opaque

pthread_slice: rename ThreadContext -> SliceThreadContext

This should prevent confusion with frame threading.

lavc: split slice and frame threading functions into separate files

pthread: drop avcodec_ prefixes from static functions

Put vp9_scans and vp9_scans_nb in ro_data.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

Merge remote-tracking branch 'lukaszmluki/master'

* lukaszmluki/master:
  lavd/pulse: add ff_ prefix and fix param type
  lavd/pulse_audio_enc: fix flush return code

Merged-by: Michael Niedermayer <michaelni@gmx.at>

x86: hpeldsp: Use PAVGB instruction macro where necessary

Signed-off-by: Mikulas Patocka <mikulas@artax.karlin.mff.cuni.cz>
Signed-off-by: Diego Biurrun <diego@biurrun.de>

Merge remote-tracking branch 'qatar/master'

* qatar/master:
  build: Remove redundant OBJS declaration intended for programs

Conflicts:
Makefile

Merged-by: Michael Niedermayer <michaelni@gmx.at>

lavd/pulse: add ff_ prefix and fix param type

Add ff_ prefix for internal API function.
Change type of param from int into enum AVCodecID as it is more specific.

Signed-off-by: Lukasz Marek <lukasz.m.luki@gmail.com>

lavd/pulse_audio_enc: fix flush return code

Successful flushing is reported by returning 1 instead of 0.

Signed-off-by: Lukasz Marek <lukasz.m.luki@gmail.com>

http: add hack to make streams served by MediaGateway not seekable

These streams are reported as seekable, but all tests show they are not,
and the server merely pretends the streams are seekable. The server
responds with:

    content-range: bytes 0-1999999999/2000000000

Range requests seem to be correctly answered, but the actual data
returned at the same offset is different. Assume this is a bug in the
server software. The server identifies itself as:

    Server: MediaGateway 3.5.2-001

Add a hack that checks the server name, and disables seeking in this
case.

Test URL: http://8283.live.streamtheworld.com:80/CBC_R1_VCR_H_SC

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

avcodec/ffv1enc: Check high bpp RGB against coder type too

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

avformat/utils: never decrease has_b_frames in compute_pkt_fields()

The intent of the original check was to increase has_b_frames when
it was incorrectly set to 0. Later codecs allowed larger values

Found-by: divVerent
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

avcodec/x86/hpeldsp: fix crash on AMD K6-3+

There are instructions pavgb and pavgusb. Both instructions do the same
operation but they have different enconding. Pavgb exists in SSE (or
MMXEXT) instruction set and pavgusb exists in 3D-NOW instruction set.

livavcodec uses the macro PAVGB to select the proper instruction. However,
the function avg_pixels8_xy2 doesn't use this macro, it uses pavgb
directly.

As a consequence, the function avg_pixels8_xy2 crashes on AMD K6-2 and
K6-3 processors, because they have pavgusb, but not pavgb.

This bug seems to be introduced by commit
71155d7b4157fee44c0d3d0fc1b660ebfb9ccf46, "dsputil: x86: Convert mpeg4
qpel and dsputil avg to yasm"

Signed-off-by: Mikulas Patocka <mikulas@artax.karlin.mff.cuni.cz>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

build: Remove redundant OBJS declaration intended for programs

ffmpeg: add verbose consistency checks in case of filtering inconsistent options

In particular, warn in case -filter and streamcopy is used at the same
time, fix trac ticket #678.