Merge commit 'a939e5b2527d0c4628815b1d3d8e29ee921227e8'

* commit 'a939e5b2527d0c4628815b1d3d8e29ee921227e8':
  h264: remove a commented out nonsense line

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

avcodec/svq3: add scaling matrix init that was removed from h264 init

This is needed for svq3

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

Merge commit '65afa65e7393e7745427e267d6c6ca814c7c8b45'

* commit '65afa65e7393e7745427e267d6c6ca814c7c8b45':
  h264: drop redundant initialization of the scaling matrices

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

Merge commit 'e1f907711a91e5ce19402a1831cfbe8f709b67f7'

* commit 'e1f907711a91e5ce19402a1831cfbe8f709b67f7':
  h264: factor out common code from init() and init_thread_copy()

Conflicts:
libavcodec/h264.c

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

avcodec/svq3: add initialization which was removed from h264 init

This is needed for the svq3 code to work

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

Merge commit '43fd3dd80ca2d1c2ccf6a7b7632db544c809c690'

* commit '43fd3dd80ca2d1c2ccf6a7b7632db544c809c690':
  h264: drop redundant initialization in init()

Conflicts:
libavcodec/h264.c

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

Merge commit '050324d020f843ce333276ebb6f27cc6026f37d0'

* commit '050324d020f843ce333276ebb6f27cc6026f37d0':
  h264: initialize cur_chroma_format_idc

See: a51fbb56bb9352476affaef1fc6773c8b059db91 / 137df692fc28710aa1a21856b1f5b9e157896fef
Merged-by: Michael Niedermayer <michaelni@gmx.at>

Merge commit '84f226a3bcd8b39801a4c9051c033ab7d61aaf76'

* commit '84f226a3bcd8b39801a4c9051c033ab7d61aaf76':
  h264: use the correct SPS during PPS parsing

Conflicts:
libavcodec/h264_ps.c

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

avfilter/yadif: 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/vsrc_mandelbrot: 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>

mpeg4: suggest mpeg4_unpack_bframes bsf instead of avidemux/VirtualDub

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

avcodec/error_resilience: Avoid race with updating the error_count

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

h264: remove a commented out nonsense line

h264: drop redundant initialization of the scaling matrices

It will always be initialized when actually parsing the PPS.

h264: factor out common code from init() and init_thread_copy()

h264: drop redundant initialization in init()

There is no real advantage to initializing any of those in init,
assuming yuv420, before the real stream parameters are known.

h264: initialize cur_chroma_format_idc

This makes sure the various DSP contexts get properly initialized in
ff_h264_set_parameter_from_sps() whatever the value of
raw_bits_per_sample.

h264: use the correct SPS during PPS parsing

There is in general no reason for the currently active SPS to be the one
referenced by the PPS being parsed.

lavf/http: add proof-of-concept http server.

Signed-off-by: Stephan Holljes <klaxa1337@googlemail.com>
Reviewed-By: Nicolas George <george@nsup.org>

avcodec: add unpack packed B-frames bitstream filter

Fixes Ticket #2913

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

webmdashenc: Support for live stream manifests

This patch adds support for creating DASH manifests for WebM Live
Streams. It also updates the documentation and adds a fate test to
verify the behavior of the new muxer flag.

Signed-off-by: Vignesh Venkatasubramanian <vigneshv@google.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

Merge commit 'aa1a1b2496cf3ca817e78e27bd0262a50adb91a1'

* commit 'aa1a1b2496cf3ca817e78e27bd0262a50adb91a1':
  avconv: Avoid theoretical NULL dereferences

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

matroskadec: Add support for parsing live header files

This patch adds support for parsing live files (produced by
-f webm_chunk) which contains only the headers but no packets. This
is only used when using -f webm_dash_manifest. There will be a
follow up patch which adds live support to WebM DASH Manifest
muxer.

Signed-off-by: Vignesh Venkatasubramanian <vigneshv@google.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

Merge remote-tracking branch 'cehoyos/master'

* cehoyos/master:
  lavf/mov: Do not overread iTunes metadata.

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

avconv: Avoid theoretical NULL dereferences

Bug-Id: CID 1292519

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

avcodec/h264_refs: More completely clear slice contexts in ff_h264_remove_all_refs()

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

avcodec/h264: Fail for invalid mixed IDR / non IDR frames in slice threading mode

Fixes Ticket4408

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

avcodec/h264_mb: assert that frame waiting code actually references 2 fields/1 frame

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

avcodec/h264_refs: Do not set reference to things which dont exist

Fixes deadlock
Fixes Ticket4428
Fixes Ticket4429

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

lavf/mov: Do not overread iTunes metadata.

Fixes ticket #4425.

avcodec/h264_slice: make current_slice reset code more strict

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

avcodec/h264: use goto end instead of return for hwaccel fails as well

This is more correct

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

avformat/rtsp: Fix null pointer dereference

This fixes CID 1257827.

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

lavf/assenc: style nits

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

matroskadec: export cover art correctly

Generally, libavformat exports cover art pictures as video streams with
1 packet and AV_DISPOSITION_ATTACHED_PIC set. Only matroskadec exported
it as attachment with codec_id set to AV_CODEC_ID_MJPEG.

Obviously, this should be consistent, so change the Matroska demuxer to
export a AV_DISPOSITION_ATTACHED_PIC pseudo video stream.

Matroska muxing is probably incorrect too. I know that it can create
broken files with an audio track and just 1 video frame when e.g.
remuxing mp3 with APIC to mkv. But for now this commit does not change
anything about muxing, and also continues to write attachments with
AV_CODEC_ID_MJPEG should the muxer application have special knowledge
that the Matroska is broken in this way.

Fixes trac #4423.

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

mpeg4: use a self-explanatory #define MAX_NVOP_SIZE

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

Merge remote-tracking branch 'cehoyos/master'

* cehoyos/master:
  Fix codec fps diplay for very small fps.
  lavf/mpeg: Support alaw in Hikvision CCTV recordings.
  lavf/mpeg: Support more audio codecs in Hikvision CCTV recordings.

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

avcodec/h264: silence ER warning when no slice threads are used

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

MAINTAINERS: add Reynaldo as a Twitter maintainer

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

avcodec/h264: reenable ER except with slice threads by default

ER with slice threads is buggy and since the merge of the libav cleanup broken
as the ER context which is supposed to be per frame has been placed in
the slice context, so there are multiple per frame which does not work as is.

Theres no bug report about ER with frame threads. If someone knows of a
case where it crashes / fails without slice threads please mail me and
open a ticket on trac.

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

Merge commit 'a4d34e218f548d381e09c483e8dc6ad18a8d571c'

* commit 'a4d34e218f548d381e09c483e8dc6ad18a8d571c':
  h264: disable ER by default

Conflicts:
libavcodec/h264.c
libavcodec/h264_picture.c
libavcodec/h264_slice.c

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

Merge commit '3892bdab9b652eb003ab95e167f1765e0b0ea035'

* commit '3892bdab9b652eb003ab95e167f1765e0b0ea035':
  avconv: do not overwrite the stream codec context for streamcopy

Conflicts:
ffmpeg.c

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

ffmpeg: Fix extradata allocation

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

tests/fate/hevc: Use a bitexact scaler in the hevc param change test to avoid failing on non x86

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

Merge commit 'b2965ec7761c99e8ef9c217a28a517e37f010480'

* commit 'b2965ec7761c99e8ef9c217a28a517e37f010480':
  FATE: add a test for parameter changes in HEVC

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

Merge commit 'df528b11ac607de13a7c438f2a51f2119f71a03c'

* commit 'df528b11ac607de13a7c438f2a51f2119f71a03c':
  hevc: make sure no dangling pointers remain around on VPS/SPS change

Conflicts:
libavcodec/hevc_ps.c

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

Merge commit 'ce0bc09ee2580d49fec90a6eb0de2ba1b580c854'

* commit 'ce0bc09ee2580d49fec90a6eb0de2ba1b580c854':
  hevc: do not change the VPS if its contents are the same

Conflicts:
libavcodec/hevc_ps.c

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

Merge commit '7693ba0a0eecdcdba71b7fbd9a4a12d1ba7b82aa'

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

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

Fix codec fps diplay for very small fps.

Fixes codec banner for the sample from ticket #4369.

lavf/mpeg: Support alaw in Hikvision CCTV recordings.

Fixes a sample from ticket #4182.

lavf/mpeg: Support more audio codecs in Hikvision CCTV recordings.

Fixes a sample from ticket #4182.

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>

h264: disable ER by default

The way it is currently designed is fundamentally unsafe and cannot be
reasonably fixed without completely rewriting it.

avconv: do not overwrite the stream codec context for streamcopy

Since we are not doing encoding, there is no point in ever touching the
separate encoding context. Always use the stream codec context.

Fixes writing attachments.

CC:libav-devel@libav.org

FATE: add a test for parameter changes in HEVC

hevc: make sure no dangling pointers remain around on VPS/SPS change

hevc: do not change the VPS if its contents are the same

This is the same as is done for SPS.

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>