Merge commit '7693ba0a0eecdcdba71b7fbd9a4a12d1ba7b82aa'

* commit '7693ba0a0eecdcdba71b7fbd9a4a12d1ba7b82aa':
  hevc: export stream parameters from extradata

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

Merge commit '1ae7afd256f9af1eb4f63f9adcf03d581ce4e2b5'

* commit '1ae7afd256f9af1eb4f63f9adcf03d581ce4e2b5':
  hevc: split out setting AVCodecContext parameters

Conflicts:
libavcodec/hevc.c

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

Merge commit '7d097a0fc57f0fa8385962a539c657c2f40b5ed0'

* commit '7d097a0fc57f0fa8385962a539c657c2f40b5ed0':
  mpegtsenc: Take max_delay into account when buffering multiple audio packets into one PES packet

Conflicts:
libavformat/mpegtsenc.c

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

cmdutils: fix "Commmand" typo

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

mpeg4: only show the divx_packed warning, when a packed frame is present

Otherwise it is shown even after the file was fixed with avidemux,
because the userdata string still ends with 'p'.

Signed-off-by: Andreas Cadhalpun <Andreas.Cadhalpun@googlemail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

ffmpeg: Fix indentation

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

ffmpeg: last frame duplication heuristic

This improves the last frames duration with CFR and when the input durations
are inaccurate or missing

Fixes Ticket4119

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

avcodec/ppc/fdctdsp: POWER LE support in ff_fdct_altivec()

add marcos VEC_FMERGEH() VEC_FMERGEL()

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

filtfmts: Avoid null pointer dereference

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

libavformat/mxf.c: Relaxed ProRes pattern

I found another MXF File containing ProRes with the following
codec_uls: 060E2B34040101010E04020102110500
Therefor I relaxed the pattern.

Related to issue #4349

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

hevc: export stream parameters from extradata

This allows the callers to have a hint of the probable stream parameters
without actually decoding anything.

hevc: split out setting AVCodecContext parameters

Additionally always set the software pixel format, so it's available
even if ff_get_format() is not called later. This will be useful for
exporting stream parameters from init().

mpegtsenc: Take max_delay into account when buffering multiple audio packets into one PES packet

Make sure we don't buffer up more than max_delay worth of data
before writing a PES packet, even if pes_payload_size is set to
a larger value.

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

doc/examples: Handle new types in avio_list_dir

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

lavf/avio: Add new types to AVIODirEntryType, bump minor version

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

doc: Slightly revise AviSynth version info

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

lavf/ftp: remove fixed length buffers from context

It saves some memory.

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

lavf/ftp: parse user and password once

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

avisynth: Bump minimum required version to interface version 6

The AVSC_API changes in the new headers mean that the 2.6 alphas
are just as incompatible as 2.5 is.

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

avisynth: Fix detection of AviSynth 2.5

In order to safely exit when the user tries to use AviSynth 2.5,
the continue_on_fail value for 2.6's functions need to be set to
1.  Otherwise, the library loader fails before the 'upgrade to
2.6' log message appears.

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

avcodec/pngenc: don't return a value in a void function

Should fix compilation failures with strict compilers

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

fate: add AVDictionary tests

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

lavu/dict: add more tests

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

lavu/dict: fix set function when reuse existing key pointer

Fixes following scenario:

av_dict_set(&d, "key", "old", 0);
AVDictionaryEentry *e = av_dict_get(d, "key", NULL, 0);
av_dict_set(&d, e->key, "new", 0);

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

png: Use libavutil's crc functions instead of zlib's

Signed-off-by: Donny Yang <work@kota.moe>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

ffmpeg_opt.c: fix regression introduced in 5743095c

-vtag is an input and output option.

Signed-off-by: Tim Nicholson <tim.nicholson@bbc.co.uk>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

avcodec/vda_h264: try to fix build

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

vda: fix h264 decoding for avcC,vda wants the entire buffer

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

avcodec/nvenc: Fix profile parameter handling

It was not possible to set a profile before, the builtin profile
parameter does not seem to work propperly.
To be compatible with libx264, this overlays it with a local parameter
that expects a string, instead of an int, that takes the well known values
"high", "main" or "baseline".

Reviewed-by: Philip Langdale <philipl@overt.org>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

Bump lavc and lavf minor versions for apng muxer and encoder.

ffmpeg: Avoid null pointer dereferences

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

apng: Add a basic APNG muxer

Additionally, update some documentation with support for APNG

Signed-off-by: Donny Yang <work@kota.moe>
Reviewed-by: Paul B Mahol <onemda@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

apng: Add a basic APNG encoder

Signed-off-by: Donny Yang <work@kota.moe>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

lavu/dict: don't accept AV_DICT_DONT_STRDUP_VAL for av_dict_set_int

Signed-off-by: Lukasz Marek <lukasz.m.luki2@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

avcodec/ccaption_dec: Remove the GOTO statement

Merge commit 'e3ec6fe7bb2a622a863e3912181717a659eb1bad'

* commit 'e3ec6fe7bb2a622a863e3912181717a659eb1bad':
  rtsp: Add a buffer_size option

Conflicts:
libavformat/rtsp.c

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

Merge commit '8c9c5479c4ba729b4ba868ab541a90b2061a7c2f'

* commit '8c9c5479c4ba729b4ba868ab541a90b2061a7c2f':
  rtp: Add an option to set the send/receive buffer size

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

Merge commit '3c47e7c4350f73fc77d8e76f0dd6d2946b13c5cc'

* commit '3c47e7c4350f73fc77d8e76f0dd6d2946b13c5cc':
  rtp: Map the urloptions to AVOptions

Conflicts:
libavformat/rtpproto.c

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

Revert "avcodec/exr: fix memset first arg in reverse_lut()"

This reverts commit 586ba24ff29468d2a4ee843a9650feea5b2be6f6.

Fixes Ticket 4386

Found-by: Martin Vignali <martin.vignali@gmail.com>

lavc/smvjpegdec: Avoid null dereference and return meaningful error codes

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

avformat/xwma: Use ff_alloc_extradata()

This prevents the fields from potentially becoming inconsistent in case of errors

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

avformat/webmdashenc: use AVERROR(ENOMEM) for memory allocation failures

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

tools/sidxindex: Use av_*malloc_array()

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

avutil/eval: check for av_malloc failure

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

avutil/eval: factor av_expr_free() calls out

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

rtsp: Add a buffer_size option

And forward it to rtp and udp.

Signed-off-by: Luca Barbato <lu_zero@gentoo.org>

rtp: Add an option to set the send/receive buffer size

It gets forwarded down to UDP.

rtp: Map the urloptions to AVOptions

Signed-off-by: Luca Barbato <lu_zero@gentoo.org>

avcodec/nvenc: Fix typoed nv_status checks

Thanks to Wyatt Aaron for pointing this out

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

avcodec/png: Clearly separate encoding header and frames

Signed-off-by: Donny Yang <work@kota.moe>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

lavu/avstring: add av_append_path_component() funcion

Convinient function to build paths.

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

avformat/mp3dec: offset seek index to end of id3v2 tag

The Xing index won't account for the id3 tag - it's relative to the
headers.

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

avcodec/libx265: export choosen picture types

Fixes part of ticket 4285

Reviewed-by Derek Buitenhuis <derek.buitenhuis@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

png: Clear up the calculation of max packet size

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

avcodec/internal: Fix doxy for ff_alloc_packet2() return value

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

vf_drawtext: add support for setting box border width

Signed-off-by: Marton Balint <cus@passwd.hu>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

avformat/http: Fix null check on allocated value

probably fixes CID 1292299

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

h264: avoid unnecessary calls to get_format

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

avfilter/vf_detelecine: Fix uninitialized array index error

Fixes the defect CID 1292301

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

lavf/segment: style nits

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

avcodec/snowenc: Check av_frame_ref() return value

Fixes CID1026740

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

avcodec/h264_refs: fix null pointer dereference with -DTRACE

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

Merge commit '4978850ca2cb1ec6908f5bc79cc592ca454d11e8'

* commit '4978850ca2cb1ec6908f5bc79cc592ca454d11e8':
  build: Split JPEG-related tables off into a separate component

Conflicts:
configure

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

Merge commit '87f87ccf32055aca25fa08e29e22cca1ba9976d5'

* commit '87f87ccf32055aca25fa08e29e22cca1ba9976d5':
  mjpeg: Use a more precise type for put_marker()

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

avutil/hmac: Check av_hmac_alloc() return code

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

swresample/swresample: Use av_mallocz_array()

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

lavf: Bump minor version and document directory listing API in doc/APIchanges.

avcodec/libdcadec: remove av_assert and check bits_per_sample more completely

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

avfilter/vf_vignette:  Change enum to int, which is accessed via AVOption as int

This fixes depending on implementation defined behavior

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

avdevice/avfoundation: Fix occured typo

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

Merge commit 'e6e3dcba0c6f11bd7022e2d3b9bcb7b6a09d6c80'

* commit 'e6e3dcba0c6f11bd7022e2d3b9bcb7b6a09d6c80':
  mjpeg: Move code only used in the encoder(s) to the appropriate header

Conflicts:
libavcodec/mjpegdec.c

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

Merge commit '6ed38b1f65b424a4fa92042e0069f350b95e0098'

* commit '6ed38b1f65b424a4fa92042e0069f350b95e0098':
  tiff: Return more meaningful error codes

Conflicts:
libavcodec/tiffenc.c

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

Merge commit '23944d29a22a2cd602753b3705f73011c3bf0b18'

* commit '23944d29a22a2cd602753b3705f73011c3bf0b18':
  indeo: Give Indeo4/5 shared code a more consistent name

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

Merge commit '7d3183d3a4e800ab7a7fa24f49968a1b1bcc0161'

* commit '7d3183d3a4e800ab7a7fa24f49968a1b1bcc0161':
  qsv: Skip header compilation depending on what parts of qsv are enabled

Conflicts:
libavcodec/Makefile

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

tiff: Return more meaningful error codes

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

build: Split JPEG-related tables off into a separate component

mjpeg: Use a more precise type for put_marker()

mjpeg: Move code only used in the encoder(s) to the appropriate header

tiff: Return more meaningful error codes

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

indeo: Give Indeo4/5 shared code a more consistent name

qsv: Skip header compilation depending on what parts of qsv are enabled

libavformat/mxfenc.c: Add 'Presentation Y offset' metadata

Previously unset, and some software mishandles files if it is absent

Signed-off-by: Tim Nicholson <tim.nicholson@bbc.co.uk>
Reviewed-by: tomas.hardin@codemill.se
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

avutil/pca: Check for av_malloc* failures

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

avformat/nutdec: Use av_malloc_array()

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

avformat/img2: Change enum to int, which is accessed via AVOption as int

This fixes depending on implementation defined behavior

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

avformat/wavenc: Change enum to int, which is accessed via AVOption as int

This fixes depending on implementation defined behavior

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

avfilter/vf_transpose: Change enums to int, which are accessed via AVOption as int

This fixes depending on implementation defined behavior

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

avfilter/tinterlace: Change enum to int, which is accessed via AVOption as int

This fixes depending on implementation defined behavior

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

avformat/udp: Remove (harmless) duplicated pkt_size entry from AVOption table

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

Merge commit 'ff7adead0a667e606f5a41dca591f074f9ff2f32'

* commit 'ff7adead0a667e606f5a41dca591f074f9ff2f32':
  udp: Fix pkt_size management

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

lavf/segment: Mark output contexts as non-seekable when applicable

This prevents sub-muxers from trying to seek back to the beginning of the
whole stream, only to find themselves overwriting some video data in the
current (often last) segment.

We only do this when not writing individual header/trailers.

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

png: Only init zlib once

Signed-off-by: Donny Yang <work@kota.moe>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

png: Calculate pixel format information only once

Signed-off-by: Donny Yang <work@kota.moe>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

png: Return slightly more meaningful error codes

Signed-off-by: Donny Yang <work@kota.moe>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

udp: Fix pkt_size management

The default value for unset is -1, not 0.

Problem introduced in 66028b7ba6b411ba12ef553e9c8f1f4a4fe27710

Bug-Id: 835

libavformat/segment: add an option to write the header to a separate file

This permits some interesting segmenting techniques with formats like Matroska,
where you can concatenate the header and segments [N, nb_segments) and get
a working file that starts at segment N's start time.

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

libavformat/segment: don't leave the list pb open when not in use

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

libavformat/hls: add an option to start from a given segment in a live stream

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

Merge remote-tracking branch 'cehoyos/master'

* cehoyos/master:
  lavc/h264_refs: Fix compilation with -DTRACE.
  Fix make checkheaders if libmfx is not available.
  lavf/gif: Add an option max_gif_delay to limit the frame duration.

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

Merge commit '72025ac36c740f031d7e413041fdfe97087c83c4'

* commit '72025ac36c740f031d7e413041fdfe97087c83c4':
  lavc: add libdcadec decoder

Conflicts:
Changelog
configure
libavcodec/Makefile
libavcodec/allcodecs.c
libavcodec/libdcadec.c

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