Merge commit '3bb91a1b5c4a0c5ec9c4d3b6649b23285c3d7f26'

* commit '3bb91a1b5c4a0c5ec9c4d3b6649b23285c3d7f26':
  configure: Add -D__USE_MINGW_ANSI_STDIO=1 to CPPFLAGS on MinGW64

Conflicts:
configure

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

tools/probetest: Check av_realloc() return code

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

postproc: fix null pointer dereference with invalid option strings

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

avutil/avstring: fix () position

Fixes CID1135751

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

avformat/utils: Check avcodec_open2() return code in av_find_stream_info()

Fixes CID1135750

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

configure: Add -D__USE_MINGW_ANSI_STDIO=1 to CPPFLAGS on MinGW64

This enables a more POSIX-compliant printf implementation, that
allows using length modifiers like 'z'.

avformat/hdsenc: fix off by 1 error in array size check

Fixes CID1135763, CID1135764

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

tools/: Add gen-rc tool for generating Windows resource files

Signed-off-by: Timothy Gu <timothygu99@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

avformat/hdsenc: fix unintentional integer overflow in hds_write_packet()

Fixes CID1135762

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

avformat/hdsenc: Check rename() return value

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

avformat/aviobuf: fix null dereference in avio_close_dyn_buf()

Fixes CID1135769

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

avfilter/aeval: Fix use of uninitialized variable

Fixes CID1135776

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

avcodec/utils: Print warning if avcodec_set_dimensions() failed

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

avcodec/bitstream: remove unused variable

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

Force one stream for raw muxers.

Based on eeb975f5
Fixes ticket #3217.

Reviewed-by: Nicolas George

avformat/oggparseopus: calculate pts/dts for initial packets after seeking

based on code from oggparsevorbis
Fixes Ticket3124
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

avformat/oggparseopus: factor opus_duration() out

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

Merge remote-tracking branch 'qatar/master'

* qatar/master:
  alsdec: check block length

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

avcodec/snowdec: check av_frame_ref() return value

Fixes CID1135742

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

avcodec/pthread_frame: Fix memleak of AVCodecContext on error

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

avcodec/indeo3: check the return code of ff_set_dimensions()

This is currently redundant as the checks before it are tighter than
the checks in ff_set_dimensions() but its more robust not to depend
on that.

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

avcodec/h264: fix code that blindly dereferences NULL DPB

Fixes mixed flushing and decoding NULL packets
Found-by: wm4
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

avcodec/hnm4video: change width/height to int

Fixes hypothetical integer overflows
Related to CID1135770 & CID1135771

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

avcodec/g2meet: check the return code of ff_set_dimensions()

This is currently redundant as the checks before it are tighter than
the checks in ff_set_dimensions() but its more robust not to depend
on that.

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

dvdsub_parse_extradata: fix memleak

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

hevc: Correctly set time_base

- Try reading the time_base information from the VPS too, not just the VUI
- Only set time_base when an SPS is activated, not when it's decoded.
- Reduce the fraction before setting it.
- Don't set anything if the fraction is invalid (because the VUI is not
  present or because the encoded value is invalid).

Conflicts:
libavcodec/hevc_ps.c

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

hevc: avoid some unnecessary differences with libav

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

sonic: Switch to rangecoder

significantly improves compression rate

This also bumps version to 2 and drops support for version 0/1
If someone used version 0/1 despite their experimental status then support
for these can and should be added back

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

avcodec/sonic: add larger version and minor_version fields with version >= 2

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

avcodec/sonic: move version to the context

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

avcodec/sonic: fix memleaks

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

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

alsdec: check block length

Fix writing over the end

Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Addresses: CVE-2013-0845

Merge remote-tracking branch 'qatar/master'

* qatar/master:
  configure: Move log2 dependency declaration to a place it takes effect

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

configure: Move log2 dependency declaration to a place it takes effect

It was incorrectly moved in c869fcdeac3b7cd71a852b928902daadeca55685.

avcodec/libvpx: set CODEC_CAP_EXPERIMENTAL correctly instead of testing at codec open time

Reviewed-by: James Zern <jzern@google.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

ffv1.4: use 2 coefficients for calculating the Y plane in the RCT

0-0.7% improved compression

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

avcodec/ffv1enc: fix use of uninitalized variable in choose_rct_params()

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

Merge remote-tracking branch 'qatar/master'

* qatar/master:
  configure: Split host and target libc detection

Conflicts:
configure

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

Merge commit 'c869fcdeac3b7cd71a852b928902daadeca55685'

* commit 'c869fcdeac3b7cd71a852b928902daadeca55685':
  configure: Move toolchain dependency declarations to a more appropriate place

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

avcodec/utils: check that extended data has been set correctly instead of forcing it in avcodec_decode_video2()

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

avcodec/libutvideodec: free coded_frame with av_frame_free() instead if av_free*

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

avcodec/libutvideodec: use av_frame_move_ref()

AVFrames cannot be copied literally, their definition is in
avutil and their extended_data can point to their data[]

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

avcodec/utils: dont depend on the channel layout in unrefcount_frame()

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

doc: Fix adelay example.

Fixes ticket #3211.

Merge remote-tracking branch 'qatar/master'

* qatar/master:
  hevc: parse frame packing arrangement SEI messages and save relevant stereo3d information

Conflicts:
libavcodec/hevc.h
libavcodec/hevc_sei.c

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

Merge commit '3d1d175367f1f22e0c4952299a258272e2e2acf1'

* commit '3d1d175367f1f22e0c4952299a258272e2e2acf1':
  mpeg12enc: set frame packing information when relevant metadata is found

Conflicts:
libavcodec/mpeg12enc.c

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

Merge commit 'bacc2869f37b17b2a89e1083289fdaf7f95f27bc'

* commit 'bacc2869f37b17b2a89e1083289fdaf7f95f27bc':
  mpeg12dec: parse frame packing arrangement user_data and save relevant stereo3d information

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

Merge commit '09cb75cdeba420d680bcb165a1ef668d8f381fed'

* commit '09cb75cdeba420d680bcb165a1ef668d8f381fed':
  libx264: set frame packing information when relevant information is found

Conflicts:
libavcodec/libx264.c

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

Merge commit '5b10ef729f610fcbc9c485e7b643ce53268144cb'

* commit '5b10ef729f610fcbc9c485e7b643ce53268144cb':
  h264: parse frame packing arrangement SEI messages and save relevant stereo3d information

Conflicts:
libavcodec/h264.c
libavcodec/h264_sei.c

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

Merge commit '7e244c68600f479270e979258e389ed5240885fb'

* commit '7e244c68600f479270e979258e389ed5240885fb':
  avframe: add codec-independent stereoscopic metadata

Conflicts:
Changelog
libavutil/Makefile
libavutil/version.h

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

cmdutils & opencl: add -opencl_bench option to test and show available OpenCL devices

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

Merge commit 'd64341e498fa46c6cf4c23d408177d7489559654'

* commit 'd64341e498fa46c6cf4c23d408177d7489559654':
  configure: Prefix libc-related variables with "libc_"

Conflicts:
libavdevice/Makefile
libavformat/Makefile

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

Merge remote-tracking branch 'cehoyos/master'

* cehoyos/master:
  Fix remuxing of IMA_QT in mov.
  Do not detect "00000000..." (and other non-changing values) as adp.

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

Merge commit '61b203ffe6c71789acb14f51483d63fe9e516842'

* commit '61b203ffe6c71789acb14f51483d63fe9e516842':
  configure: detect Solaris libc

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

Merge commit '9b8d11a76ae7bca8bbb58abb822138f8b42c776c'

* commit '9b8d11a76ae7bca8bbb58abb822138f8b42c776c':
  avcodec: Use av_reallocp where suitable

Conflicts:
libavcodec/bitstream.c
libavcodec/eatgv.c
libavcodec/flashsv.c
libavcodec/libtheoraenc.c
libavcodec/libvpxenc.c

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

Merge commit 'd4f1188d1a662fed5347e70016da49e01563e8a8'

* commit 'd4f1188d1a662fed5347e70016da49e01563e8a8':
  dv: use AVFrame API properly

Conflicts:
libavcodec/dvdec.c

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

Merge commit 'c9ca220ef26e36abd22085e6fa156c0dbc43bbf0'

* commit 'c9ca220ef26e36abd22085e6fa156c0dbc43bbf0':
  ac3dec: make drc_scale exponentially

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

Merge commit '37a749012aaacc801fe860428417a6d7b81c103f'

* commit '37a749012aaacc801fe860428417a6d7b81c103f':
  lavc: rework handling of refcounted_frames=0

Conflicts:
libavcodec/utils.c

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

configure: Split host and target libc detection

configure: Move toolchain dependency declarations to a more appropriate place

Merge commit 'df7aba52b51007db50410abe15fe28391abd8757'

* commit 'df7aba52b51007db50410abe15fe28391abd8757':
  frame: cosmetics, reindent

Conflicts:
libavutil/frame.c

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

Merge commit 'c342132fa8a29692e28c98238e3a31da5c407e42'

* commit 'c342132fa8a29692e28c98238e3a31da5c407e42':
  frame: copy flags in av_frame_copy_props()

Conflicts:
libavutil/frame.c

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

Merge commit 'a1ee1648690726b34e98eaf8db04fd7b3303cfc8'

* commit 'a1ee1648690726b34e98eaf8db04fd7b3303cfc8':
  lavc/decode_video(): always unref the frame if there is no output in decode_video

Conflicts:
libavcodec/utils.c

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

Merge commit '85f947aefb3dae81f65f518acdffa8e31c679654'

* commit '85f947aefb3dae81f65f518acdffa8e31c679654':
  lavc: remove a pointless check in decode_audio4()

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

Merge commit 'd4f0f2d1e80b76260eb6b9cdde472ac069dfda56'

* commit 'd4f0f2d1e80b76260eb6b9cdde472ac069dfda56':
  lavc: use buf[0] instead of data[0] as the indicator of an allocated frame

Conflicts:
libavcodec/utils.c

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

hevc: parse frame packing arrangement SEI messages and save relevant stereo3d information

mpeg12enc: set frame packing information when relevant metadata is found

mpeg12dec: parse frame packing arrangement user_data and save relevant stereo3d information

libx264: set frame packing information when relevant information is found

h264: parse frame packing arrangement SEI messages and save relevant stereo3d information

avframe: add codec-independent stereoscopic metadata

Merge commit 'e5419709f50593769037ab77d7102f82d9260784'

* commit 'e5419709f50593769037ab77d7102f82d9260784':
  lavc: remove the extended_data workarounds.

Conflicts:
libavcodec/utils.c

One hunk is not merged as not all codecs are updated yet

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

Fix remuxing of IMA_QT in mov.

Fixes ticket #1603.

Do not detect "00000000..." (and other non-changing values) as adp.

Merge commit 'd351ef47d0e0ccb7de96b37f137c16b2885580ac'

* commit 'd351ef47d0e0ccb7de96b37f137c16b2885580ac':
  pthread_frame: use the AVFrame API properly.

Conflicts:
libavcodec/pthread_frame.c

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

Revert: flvenc: Don't pretend to support muxing "plain" VP6

Muxing VP6 is used by applications and works with Flashplayer.

Reported-by: David Bertrand

Merge commit 'b605b123ef1d3bac0e7c221d8d7fa74cd8c7253c'

* commit 'b605b123ef1d3bac0e7c221d8d7fa74cd8c7253c':
  mxpegdec: use the AVFrame API properly.

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

Merge commit 'afa21a12bf084f905187615706b0a8d92bc98661'

* commit 'afa21a12bf084f905187615706b0a8d92bc98661':
  p*menc: use the AVFrame API properly.

Conflicts:
libavcodec/Makefile
libavcodec/pamenc.c
libavcodec/pnmenc.c

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

Merge commit 'e2274aa555f023e4f4e4819bf29b2d7e0adec7d5'

* commit 'e2274aa555f023e4f4e4819bf29b2d7e0adec7d5':
  mjpegdec: use the AVFrame API properly.

Conflicts:
libavcodec/mjpegdec.c

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

Add support for picture_ptr field in MJpegDecodeContext

Signed-off-by: Anton Khirnov <anton@khirnov.net>
(cherry picked from commit e0e3b8b297bae5144f23fd4b46a1309857040b63)

Conflicts:

libavcodec/jpeglsdec.c
libavcodec/mjpegbdec.c
libavcodec/mjpegdec.c

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

Merge commit 'f0b234ab9e406efee85c17eb435db646092a943b'

* commit 'f0b234ab9e406efee85c17eb435db646092a943b':
  avformat: AviSynth demuxer rewrite

Conflicts:
configure
libavformat/avisynth.c

See: b9ad009475f3afb76bd2fbd92936dc4d4cd441ec (as well as later commits)
Merged-by: Michael Niedermayer <michaelni@gmx.at>

configure: Prefix libc-related variables with "libc_"

Simplifies host/target libc detection splitting.

configure: detect Solaris libc

Add preprocessor flags for API availability as necessary.

Signed-off-by: Diego Biurrun <diego@biurrun.de>

avcodec: Use av_reallocp where suitable

Signed-off-by: Martin Storsjö <martin@martin.st>

dv: use AVFrame API properly

ac3dec: make drc_scale exponentially

The a52 spec suggests that "partial compression" should scale the
drc value in this manner.

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

lavc: rework handling of refcounted_frames=0

Use only proper AVFrame API (no assigning of whole frames, since that
hardcodes sizeof(AVFrame) into lavc).

Make a copy of the side data, so the caller can use av_frame_unref/free
on non-refcounted frames, eliminating the need for
avcodec_get_frame_defaults()/avcodec_free_frame().

frame: cosmetics, reindent

frame: copy flags in av_frame_copy_props()

Flags can be considered metadata (at least those that are defined now).

lavc/decode_video(): always unref the frame if there is no output in decode_video

Not just on failure. This is the same thing that is done in the audio
path and should prevent leaks in decoders that allocate a frame, but
then end up not writing into it.

lavc: remove a pointless check in decode_audio4()

av_frame_unref() works fine on unallocated frames.

lavc: use buf[0] instead of data[0] as the indicator of an allocated frame

data[0] may be NULL for valid frames with hwaccel pixel formats.

lavc: remove the extended_data workarounds.

All decoders should now handle it properly.

pthread_frame: use the AVFrame API properly.

Remove the extended_data workaround, all decoders should now handle this
properly.

mxpegdec: use the AVFrame API properly.

p*menc: use the AVFrame API properly.

mjpegdec: use the AVFrame API properly.

Merge remote-tracking branch 'qatar/master'

* qatar/master:
  configure: Move adding of compat objects out of libc detection

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

Merge commit '4958f35a2ebc307049ff2104ffb944f5f457feb3'

* commit '4958f35a2ebc307049ff2104ffb944f5f457feb3':
  dsputil: Move apply_window_int16 to ac3dsp

Conflicts:
libavcodec/arm/ac3dsp_init_arm.c
libavcodec/arm/ac3dsp_neon.S
libavcodec/x86/ac3dsp_init.c

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