Merge commit '1f80742f49a9a4e846c9f099387881abc87150b2'

* commit '1f80742f49a9a4e846c9f099387881abc87150b2':
  qdm2: avoid integer overflow

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

Merge commit '312daa15891dc7abb77a404fe927d5ee35c52a71'

* commit '312daa15891dc7abb77a404fe927d5ee35c52a71':
  vp9: Use the correct upper bound for seg_id

Conflicts:
libavcodec/vp9.h
libavcodec/vp9block.c

Not merged, the value was correct before as far as i can see

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

Merge commit 'd466d82faaf6e0e57a3a4be5e38e3902ef251ac3'

* commit 'd466d82faaf6e0e57a3a4be5e38e3902ef251ac3':
  dvdsubdec: Do not leak on failure path

Conflicts:
libavcodec/dvdsubdec.c

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

Merge commit 'a42d5c861fea8d18d997c6ba3f4a1d8aa95a288b'

* commit 'a42d5c861fea8d18d997c6ba3f4a1d8aa95a288b':
  libtwolame: prevent a NULL pointer dereference

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

avfilter/formats: Alloc NULL fmts in SET_COMMON_FORMATS()

This avoids null pointer dereferences in case memory allocation has failed

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

avfilter/formats: free the correct pointer in ADD_FORMAT()

Also only free it when it was not previously allocated to return to the
state prior to the failing function call

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

Merge commit '863ee8a855b8ce27ffef41479eb66da58763faed'

* commit '863ee8a855b8ce27ffef41479eb66da58763faed':
  lavfi: clean memory on error in ADD_FORMAT()

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

Merge commit 'fd9badd3cb3b60f5c54dcea35523e1ecca2f67a6'

* commit 'fd9badd3cb3b60f5c54dcea35523e1ecca2f67a6':
  xwma: Do not leak on failure path

Conflicts:
libavformat/xwma.c

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

Merge commit 'aa8b39d999589154f79300de9038994d0093cd34'

* commit 'aa8b39d999589154f79300de9038994d0093cd34':
  lavc: Move the libtwolame encoder registration to the list for external libraries

Conflicts:
libavcodec/allcodecs.c

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

Changelog: add zygoaudio

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

avcodec/libspeexdec: more verbose error message

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

avcodec/libspeexdec: support zygoaudio

Fixes Ticket1873

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

avcodec/vp6: Use av_freep(), avoid leaving stale pointers

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

avdevice/avdevice.c: Use av_freep(), avoid leaving stale pointers

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

avdevice/fbdev_common: Use av_freep(), avoid leaving stale pointers

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

avdevice/pulse_audio_common: Use av_freep(), avoid leaving stale pointers

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

avformat/apngdec: add APNG demuxer.

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

avcodec/pngdec: add APNG support.

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

avformat: replace some odd 30-60 rates by higher less odd ones in  get_std_framerate()

Fixes Ticket4012

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

qdm2: avoid integer overflow

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

vp9: Use the correct upper bound for seg_id

And use a macro to make apparent why the value.

Bug-Id: CID 1108595

dvdsubdec: Do not leak on failure path

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

libtwolame: prevent a NULL pointer dereference

CC: libav-stable@libav.org
Bug-Id: CID 1250330 / CID 1250335

lavfi: clean memory on error in ADD_FORMAT()

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

xwma: Do not leak on failure path

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

lavc: Move the libtwolame encoder registration to the list for external libraries

This makes sure the default behaviour of using the internal encoder
stays the same regardless if libtwolame is enabled or not (as for
any external library).

This fixes fate-lavf-mpg if libav is built with libtwolame enabled.

CC: libav-stable@libav.org
Signed-off-by: Vittorio Giovara <vittorio.giovara@gmail.com>

avformat/avidec: fix handling dv in avi

Fixes Ticket4086

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

lavu/dict: add av_dict_get_string

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

lavc/options: fix rc_eq leak

rc_eq is an option, so it is copied by av_opt_copy(dest, src); above.

avcodec/imc: Use avpriv_float_dsp_alloc()

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

avcodec/dcadec: Use avpriv_float_dsp_alloc()

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

avcodec/atrac1: Use avpriv_float_dsp_alloc()

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

avcodec/ac3dec: Use avpriv_float_dsp_alloc()

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

configure: disable strip when using icl.

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

avcodec/mpeg12dec: forward error codes

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

avcodec/mpeg12dec: Use more specific error codes

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

avcodec/mpeg12dec: do not fail on invalid frame_rate_index

Fixes Ticket4073

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

avcodec/mpeg12dec: Print error/warning messages on issues in mpeg1_decode_sequence()

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

configure: Prevent icl being incorrectly detected as msvc.

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

Merge remote-tracking branch 'cehoyos/master'

* cehoyos/master:
  lavf/mux: Always call write_trailer() from av_write_trailer() to avoid a leak.

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

avutil/arm/float_dsp_init_vfp: replace restrict by av_restrict

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

lavf/mux: Always call write_trailer() from av_write_trailer() to avoid a leak.

Fixes ticket #4049.

Changelog: add WebP muxer

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

swscale/x86/rgb2rgb_template: handle the first 2 lines with C in rgb24toyv12_*()

This avoids out of array accesses
Should fix Ticket3451

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

avformat/dtsdec: dts_probe: check reserved bit, check lfe, check sr_code similarity

Fixes misdetection of s16le
Fixes Ticket4109

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

Merge commit '7fd10f66b722eccc2ada9128766d002f6d751f79'

* commit '7fd10f66b722eccc2ada9128766d002f6d751f79':
  hdsenc: Clear the previous codec tag when setting up the chained muxer

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

Merge commit 'f918b8a2933a65020cbe490ec637d5485c11a692'

* commit 'f918b8a2933a65020cbe490ec637d5485c11a692':
  hdsenc: Use the right filename in an error message

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

avformat/avienc: write last frame duration

Fixes small part of Ticket 3052

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

avformat/avienc: factor frame skip code out

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

ffmpeg: skip duration cliping for passthrough & drop modes

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

doc/writing_filters: use ffmpeg.org instead of wikimedia.org for lena image

Less likely to change, and under our control.

Thanks-to: Michael Niedermayer

ffmpeg: Check duration for overlap and clip in fps cfr/vfr code

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

ffmpeg: Use input packet duration in vfr/cfr code if available and valid

Fixes Ticket3052

avcodec/twinvq: Use av_freep() to avoid leaving stale pointers in memory

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

avcodec/tta: Use av_freep() to avoid leaving stale pointers in memory

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

avcodec/truemotion2: Use av_freep() to avoid leaving stale pointers in memory

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

ffmpeg: fix printed timestamp for droped frames

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

hdsenc: Clear the previous codec tag when setting up the chained muxer

The chained flv muxer wants one set of tags - normally this set
could be signaled via the AVOutputFormat codec_tag field (as
smoothstreamingenc and dashenc do). hdsenc doesn't signal it, since
the FLV codec tag arrays aren't exported from flvenc.c. This can
lead to the caller keeping an original codec tag from the originating
container here, which would then be a mismatch for the FLV muxer.
Since we don't really care about what codec tag the caller might
have set, just clear it and let the lavf muxer layer set the right
one for the chained FLV muxer later instead.

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

hdsenc: Use the right filename in an error message

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

lavf/concatdec: add timestamp log

Help debugging timestamp conversion issues.

ffmpeg: better CFR frame duplication selection

This improves the handling of cases where the frame duration is not known

Fixes Ticket 4119
Fixes Ticket 1578

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

ffmpeg: fix variable type for end char

fixes warning

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

avformat/mpegtsenc: change the min value for mpegts_start_pid to allow ATSC PIDs

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

dashenc: degrade gracefully if a stream's bitrate is unavailable

If a stream's bitrate is not set, this attempts to use its rc_max_rate;
if neither is set, it avoids writing a bandwidth attribute at all.

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

doc/writing_filters: fix reference to Lenna image

doc/writing_filters: use a more portable sed command in the walk-through

Merge commit '7813e6752bdab38a5686c301e869ee71d97bce69'

* commit '7813e6752bdab38a5686c301e869ee71d97bce69':
  configure: Fix enabling memalign_hack automatically

Conflicts:
configure

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

avcodec/libvorbisenc: Give CODEC_CAP_SMALL_LAST_FRAME to libvorbis encoder.

The libvorbis encoder already supports a small last frame, but the layer
above doesn't know that because we didn't register the small last frame
capability.

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

avcodec/options: Set AVCodecContext->codec upon initialization.

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

configure: Fix enabling memalign_hack automatically

simd_align_16 is a configure item that can be enabled or disabled,
it's not a variable containing a list of other configure items
as need_memalign previously. This was broken in eba2233b5.

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

lavf/ffmenc: fix memleak in ffm_write_header

Regression since 745730c9c208c40f800d5d71ffa39aceab6ce044.
The dynamic buffer was not being used or freed.

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

doc/filters: use '|' instead of ':' in the documentation.

Using colons to separate the outdefs is deprecated. Switch to using '|'
to separate the list items.

Signed-off-by: Simon Thelen <ffmpeg-dev@c-14.de>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

avfilter/af_volume: Use avpriv_float_dsp_alloc()

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

avfilter/af_amix: Use avpriv_float_dsp_alloc()

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

avcodec/nellymoser: Use avpriv_float_dsp_alloc()

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

doc/APIchanges: Fix some wrong versions

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

avutil/float_dsp: add avpriv_float_dsp_alloc()

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

libavcodec/tiffenc: Use av_freep() avoid leaving stale pointers in memory

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

libavcodec/libxavs: Use av_freep() avoid leaving stale pointers in memory

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

libavcodec/libx264: Use av_freep() avoid leaving stale pointers in memory

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

avcodec/mjpegdec: Support some subsampled  GBR variants

Fixes Ticket4045

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

avformat/mp3dec: avoid seeking to negative positions

Fixes Ticket4038

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

avcodec/internal: Add () to argument of FF_SIGNBIT() to ensure correct order or operations

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

Merge commit '2007082d2db25f9305b8a345798b840ea7784fdb'

* commit '2007082d2db25f9305b8a345798b840ea7784fdb':
  mov: check ff_get_wav_header() return value

Conflicts:
libavformat/mov.c

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

Merge commit '85dc006b1a829726dd5e3a9b0fcc6a1dbfe6dffa'

* commit '85dc006b1a829726dd5e3a9b0fcc6a1dbfe6dffa':
  lavc: fix bitshifts amount bigger than the type

Conflicts:
libavcodec/internal.h

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

Merge commit '771656bd85416cd6308b11aed6f2c69a8db9c21b'

* commit '771656bd85416cd6308b11aed6f2c69a8db9c21b':
  libvpxenc: clean memory on error

Conflicts:
libavcodec/libvpxenc.c

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

Merge commit 'a28468d0daf4be14761c16a3ddd33266b2380123'

* commit 'a28468d0daf4be14761c16a3ddd33266b2380123':
  librtmp: append the correct field to the string

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

Merge commit '9257692ac15eff7b07540c1f61cebde0d8823fbd'

* commit '9257692ac15eff7b07540c1f61cebde0d8823fbd':
  lavf: Only initialize s->offset once when using avoid_negative_ts make_zero

Conflicts:
libavformat/mux.c

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

mov: check ff_get_wav_header() return value

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

lavc: fix bitshifts amount bigger than the type

CC: libav-stable@libav.org
Bug-Id: CID 1194387 / CID 1194389 / CID 1194393 / CID 1206638

libvpxenc: clean memory on error

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

librtmp: append the correct field to the string

Also prevent a NULL pointer dereference.

CC: libav-stable@libav.org
Bug-Id: CID 1250329 / CID 1250331

avdevice/oss_audio: avoid strerror() and errbuf

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

Merge commit 'c302d034ba2690a935df8bf7e4f5d44ed86e8d5c'

* commit 'c302d034ba2690a935df8bf7e4f5d44ed86e8d5c':
  tools: Add a sidxindex tool

Conflicts:
libavformat/Makefile

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

Merge commit '40ed1cbf147d09fc0894bee160f0b6b6d9159fc5'

* commit '40ed1cbf147d09fc0894bee160f0b6b6d9159fc5':
  movenc: Allow writing a DASH sidx atom at the start of files

Conflicts:
libavformat/movenc.c

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

Merge commit '3847f3ab58b3b74604807394247bf68827258103'

* commit '3847f3ab58b3b74604807394247bf68827258103':
  movenc: Add tfra entries for all tracks in a moof

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

lavf: Only initialize s->offset once when using avoid_negative_ts make_zero

When given a stream starting at dts=0, it would previously consider
s->offset as uninitialized and set an offset when the second packet
was written, ending up writing two packets with dts=0. By initializing
this field to AV_NOPTS_VALUE, we make sure that we only initialize it
once, on the first packet.

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

Merge commit 'fe5e6e34c05e274f98528be4f77f3c474473f977'

* commit 'fe5e6e34c05e274f98528be4f77f3c474473f977':
  lavf: Add an MPEG-DASH ISOFF segmenting muxer

Conflicts:
Changelog
libavformat/Makefile
libavformat/allformats.c
libavformat/version.h

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

Merge commit '2ded57371abead879bcee56da5131e5fac0d17ef'

* commit '2ded57371abead879bcee56da5131e5fac0d17ef':
  movenc: Add support for writing sidx atoms for DASH segments

Conflicts:
Changelog
libavformat/version.h

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

Merge commit '2d9d6afb8d2f284f5e620ecc19f643d5cd3facb8'

* commit '2d9d6afb8d2f284f5e620ecc19f643d5cd3facb8':
  movenc: Factorize adding fragment info into a separate function

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