Merge commit '0db6bbb24c1a9f6b5527f460361a5a4132248eee'

* commit '0db6bbb24c1a9f6b5527f460361a5a4132248eee':
  avformat: Make avformat_free_context handle NULL

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

Merge commit 'c92965dbfbb7e2b49df14db2fd0e23a29295730a'

* commit 'c92965dbfbb7e2b49df14db2fd0e23a29295730a':
  avconv: check return value

Conflicts:
ffmpeg.c

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

Merge commit 'c802a2e718fb3619291f310f851f1a1cdcf4f581'

* commit 'c802a2e718fb3619291f310f851f1a1cdcf4f581':
  avconv: fix leak in filter error

Conflicts:
ffmpeg_filter.c

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

Merge commit 'aeb23fc4549a25ef32ff085d2a76227f90caf403'

* commit 'aeb23fc4549a25ef32ff085d2a76227f90caf403':
  avprobe: Remove a pointless check

Conflicts:
avprobe.c

No change as the code does not exist in ffprobe

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

Merge commit 'e58a140cf91d1a9cdfa3115d73c923dab0e9e7dc'

* commit 'e58a140cf91d1a9cdfa3115d73c923dab0e9e7dc':
  avplay: Always free opts

Conflicts:
ffplay.c

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

Merge commit 'cf83c0173917a44b89a25ea2b435429bbf9ee767'

* commit 'cf83c0173917a44b89a25ea2b435429bbf9ee767':
  avplay: Always free find_stream_info options

Conflicts:
ffplay.c

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

tests/fate/mpeg4: fix samples path

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

Merge commit 'f29c226af0ecc34c417b646580a9acd7d8bbaf48'

* commit 'f29c226af0ecc34c417b646580a9acd7d8bbaf48':
  fate: add mpeg4 tests for frame size changes

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

avformat/m4vdec: mark as possibly containing discontinuities

This will be needed for the resolution change mpeg4 test

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

avformat: Make avformat_free_context handle NULL

Work as the other free()-like functions.

Bug-Id: CID 1087081
CC: libav-stable@libav.org

avconv: check return value

CC: libav-stable@libav.org
Bug-Id: CID 1224275

avconv: fix leak in filter error

CC: libav-stable@libav.org
Bug-Id: CID 1005311

avprobe: Remove a pointless check

The element is always valid.

CC: libav-stable@libav.org
Bug-Id: CID 732276

avplay: Always free opts

CC: libav-stable@libav.org
Bug-Id: CID 733793

avplay: Always free find_stream_info options

CC: libav-stable@libav.org
Bug-Id: CID 1238794

fate: add mpeg4 tests for frame size changes

doc/filters.texi: fix several typos in the vidstab* sections

Also create an anchor for the unsharp filter, and references to
it in its mentions.

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

x86/vf_noise: move asm code to a separate file

Reviewed-by: Michael Niedermayer <michaelni@gmx.at>
Signed-off-by: James Almer <jamrial@gmail.com>

swresample/resample: fix invert_initial_buffer() after flush

Fixes: asan_heap-uaf_2071250_7_139.ogg
Fixes: assertion failure
Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

swresample: do not put multiple statements in one line

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

avformat/id3v2: silence a warning when CONFIG_ZLIB is unset.

dlen is only read when CONFIG_ZLIB is set, so mark it as possibly
unused.

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

avfilter/vf_noise: Use a separate seed for each plane

This should reduce the correlation between planes

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

avfilter/vf_noise: use per component rand_shift

This allows using different shifts per plane

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

avfilter/vf_noise: move shift calculation to filter_frame()

This makes the temporal noise case deterministic with threads

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

avfilter/vf_noise: fix high resolution support

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

Merge commit '979932378ae3fbf452e312eb759cc7ce175f78de'

* commit '979932378ae3fbf452e312eb759cc7ce175f78de':
  ismindex: use tfhd default duration if no sample duration

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

Merge commit '460b509a34fb5fad3bedac8429f53594d3923ea8'

* commit '460b509a34fb5fad3bedac8429f53594d3923ea8':
  rtsp: Check a memory allocation

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

Fix initialisers in dct-test.c.

Silences a warning when running fate on unusual platforms:
libavcodec/dct-test.c:101:21: warning: missing braces around initializer [-Wmissing-braces]
libavcodec/dct-test.c:101:21: warning: (near initialization for 'fdct_tab_arch[0]') [-Wmissing-braces]
libavcodec/dct-test.c:102:21: warning: missing braces around initializer [-Wmissing-braces]
libavcodec/dct-test.c:102:21: warning: (near initialization for 'idct_tab_arch[0]') [-Wmissing-braces]

ismindex: use tfhd default duration if no sample duration

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

rtsp: Check a memory allocation

CC: libav-stable@libav.org
Signed-off-by: Martin Storsjö <martin@martin.st>

mpegts: add the judgement if a new program is created successfully

Add the judement after create a new program to avoid segment fault.

Signed-off-by: Di Wu <di1028.wu@samsung.com>
Reviewed-by: Marton Balint <cus@passwd.hu>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

avformat/util: Simplify av_guess_frame_rate() by using AVCodecContext.framerate

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

avformat/utils: Try to correct the codec_framerate in ff_compute_frame_duration() for the encoding case

No testcase where this makes a difference is known

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

avformat/oggparsedirac: use AVCodecContext.framerate

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

avcodec/avcodec: more verbose documentation for time_base

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

avcodec/avcodec: fix non doxy comment

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

Merge commit '79dd756e143a54efc25d64e90505f0dca6cbc4ec'

* commit '79dd756e143a54efc25d64e90505f0dca6cbc4ec':
  rtmpproto: Fix a typo

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

Merge commit 'ced7238cd01cc2199acf9225305628641a27c1d7'

* commit 'ced7238cd01cc2199acf9225305628641a27c1d7':
  rtpdec_hevc: Use av_realloc instead of av_malloc+memcpy

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

Merge commit '752e71e74f50e7a6f9a19edb8e775b2ea2fb94d8'

* commit '752e71e74f50e7a6f9a19edb8e775b2ea2fb94d8':
  rtpdec_hevc: Rename a variable for clarity

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

Merge commit '74b02377980321934e33969c84733ace7e9f4eeb'

* commit '74b02377980321934e33969c84733ace7e9f4eeb':
  mov: Correctly check the color transfer characteristics range

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

Merge commit '1ac5a29b2e5ddeae068deb9d6e0e803a91941d4d'

* commit '1ac5a29b2e5ddeae068deb9d6e0e803a91941d4d':
  imc: fix order of operations in coefficients read

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

avformat/mov: auodetect "use_mfra_for"

Reviewed-by: Mika Raento <mikie@iki.fi>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

build: mov_muxer requires ac3_parser

Reviewed-by: Benoit Fouet <benoit.fouet@free.fr>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

avformat/rtsp: check memory allocation

Reviewed-by: Reimar Döffinger <Reimar.Doeffinger@gmx.de>
Commit message by: Benoit Fouet <benoit.fouet@free.fr>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

rtmpproto: Fix a typo

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

rtpdec_hevc: Use av_realloc instead of av_malloc+memcpy

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

rtpdec_hevc: Rename a variable for clarity

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

doc/encoders: add basic libx265 documentation

Fixes ticket #3944.

Signed-off-by: Lou Logan <lou@lrcd.com>

avcodec/ass: add FFmpeg signature

avformat/assdec: typo fix

avcodec/ass_split: realign after addition of new fields

avcodec/ass_split: assume default order when "Format:" line is not found

Fixes the decoding of the ASS stream in a mkv from a fansub release from
Coalgirls.

avcodec/ass_split: extend recognized fields in ASS splitter

This simplifies the logic for the fix in the next commit.

avcodec/ass: output missing fields in AVSubtitles and output files

Fixes Ticket #3207

avformat/assenc: support remuxing old V4 ASS form (SSA)

fate: fix some subtitles tests dependencies

fate: add rawdiff and use it for subtitles

We want subtitles tests to match exactly line endings and trailing
characters.

fate: make subtitles tests output to stdout instead of md5

This makes tracking subtitles changes simpler.

doc/filters: update link to OpenCV docs

Signed-off-by: Lou Logan <lou@lrcd.com>

Merge commit 'e5cfc8fdad901c9487fe896421972852f38bcf5'

* commit 'e5cfc8fdad901c9487fe896421972852f38bcf5':
  sdp: Provide out of bound parameter sets for HEVC if extradata is set

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

Merge commit '9b7f932ee568cadfc0f556a061fcc00cb63f9780'

* commit '9b7f932ee568cadfc0f556a061fcc00cb63f9780':
  rtpdec_hevc: Parse out of band vps/sps/pps/sei from fmtp lines

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

Merge commit '557d4c4ecae080729e68df54ed2bd8420d0f037a'

* commit '557d4c4ecae080729e68df54ed2bd8420d0f037a':
  avconv: replace AVCodecContext.time_base with framerate

Conflicts:
ffmpeg.c

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

avformat/utils: use av_reduce() to simplify code and avoid overflow in ff_compute_frame_duration()

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

Merge commit '2d6e58497e76836604364b037df9b00ba3d75b69'

* commit '2d6e58497e76836604364b037df9b00ba3d75b69':
  lavf: switch to AVCodecContext.framerate for demuxing

Conflicts:
libavformat/utils.c

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

avcodec/dpx: fix framerate

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

avcodec/vc1: fix time_base and framerate

They are not just inverses of each other.
This should restore behavior to before the introduction of framerate

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

avcodec/h264: fix time_base and framerate

They are not just inverses of each other.
This should restore behavior to before the introduction of framerate

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

avcodec/mpeg12dec: fix time_base and framerate

They are not just inverses of each other.
This should restore behavior to before the introduction of framerate

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

avcodec/utils: fix time_base after the framerate addition

time_base != 1/framerate for example for interlaced video

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

Merge commit '7ea1b3472a61de4aa4d41b571e99418e4997ad41'

* commit '7ea1b3472a61de4aa4d41b571e99418e4997ad41':
  lavc: deprecate the use of AVCodecContext.time_base for decoding

Conflicts:
libavcodec/avcodec.h
libavcodec/h264.c
libavcodec/mpegvideo_parser.c
libavcodec/utils.c
libavcodec/version.h

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

mov: Correctly check the color transfer characteristics range

Reported-by: Ruoyu <liangry@ucweb.com>

imc: fix order of operations in coefficients read

Reported-by: Ruoyu <liangry@ucweb.com>

Merge commit 'd565fef1b83b6c5f8afb32229260b79f67c68109'

* commit 'd565fef1b83b6c5f8afb32229260b79f67c68109':
  vdpau: add AV_HWACCEL_FLAG_IGNORE_LEVEL to skip the codec level check

Conflicts:
libavcodec/version.h

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

Merge commit 'c1724623ce0433c6a9ee72133b1fd4db75ec7193'

* commit 'c1724623ce0433c6a9ee72133b1fd4db75ec7193':
  vdpau: have av_vdpau_bind_context() fail on unsupported flag

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

Merge commit 'e09a947c1a856d9d34199a13ee378fe46be53d3a'

* commit 'e09a947c1a856d9d34199a13ee378fe46be53d3a':
  doc: fix typing mistake

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

sdp: Provide out of bound parameter sets for HEVC if extradata is set

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

rtpdec_hevc: Parse out of band vps/sps/pps/sei from fmtp lines

These are assembled into extradata in the order vps/sps/pps/sei.

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

avconv: replace AVCodecContext.time_base with framerate

lavf: switch to AVCodecContext.framerate for demuxing

lavc: deprecate the use of AVCodecContext.time_base for decoding

When decoding, this field holds the inverse of the framerate that can be
written in the headers for some codecs. Using a field called 'time_base'
for this is very misleading, as there are no timestamps associated with
it. Furthermore, this field is used for a very different purpose during
encoding.

Add a new field, called 'framerate', to replace the use of time_base for
decoding.

vdpau: add AV_HWACCEL_FLAG_IGNORE_LEVEL to skip the codec level check

Decoding acceleration may work even if the codec level is higher than
the stated limit of the VDPAU driver. Or the problem may be considered
acceptable by the user. This flag allows skipping the codec level
capability checks and proceed with decoding.

Applications should obviously not set this flag by default, but only if
the user explicitly requested this behavior (and presumably knows how
to turn it back off if it fails).

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

vdpau: have av_vdpau_bind_context() fail on unsupported flag

Currently, no flags are supported.

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

doc: fix typing mistake

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

avformat/mxfdec: cleanup if parsing the header metadata fails

Fixes memleaks
Fixes: asan_static-oob_87d116_10_201.mxf
Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

avformat/mxfdec: Fix memleak of packages_refs

Fixes: asan_static-oob_87d116_10_201.mxf
Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

avformat/mxfdec: Fix memleak of primer_packs

Fixes: asan_static-oob_87d116_10_201.mxf
Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

avformat/mxfdec: Fix termination of mxf_data_essence_container_uls

Fixes: asan_static-oob_87d116_10_201.mxf
Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

Merge commit 'a74f8121d88e0bdf0d69c22e4b3713032da9300a'

* commit 'a74f8121d88e0bdf0d69c22e4b3713032da9300a':
  mov: Handle tfdt atoms

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

Merge commit 'c2c22c75cf89e2faab34d1ee1d392cfb065439ea'

* commit 'c2c22c75cf89e2faab34d1ee1d392cfb065439ea':
  movenc: Write tfdt atoms

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

avcodec/iirfilter: Make ff_iir_filter_free_state() also zero the freed pointer

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

avcodec/iirfilter: Change ff_iir_filter_free_coeffs() so it clears the pointers as well

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

avcodec/flac_parser: use av_freep(), do not leave stale pointers in memory

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

avcodec/flac_parser: use av_freep(), do not leave stale pointers in memory

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

avfilter/vf_pp: add gbrp support

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

mov: Handle tfdt atoms

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

movenc: Write tfdt atoms

These allow getting the absolute start timestamp of a fragment
without reading preceding timestamps. This fixes sync between
tracks if starting from fragments in different streams that don't
align exactly.

This also is a prerequisite for producing DASH content.

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

avformat/mp3enc: use initial_padding

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

ffmpeg: Fix stream copy with initial_padding

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

Merge commit 'eabdc2a830f1ab1a3f12243eb7e2fba801cb81f0'

* commit 'eabdc2a830f1ab1a3f12243eb7e2fba801cb81f0':
  lavf: use initial_padding instead of deprecated delay

Conflicts:
libavformat/matroskaenc.c

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

avcodec/ac3enc_template: use the initial_padding field

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