Merge commit '94a417acc05cc5151b473abc0bf51fad26f8c5a0'

* commit '94a417acc05cc5151b473abc0bf51fad26f8c5a0':
  mathematics: remove asserts from av_rescale_rnd()

Conflicts:
libavutil/mathematics.c

The asserts are left in place for now as no code checks the return
value, but we sure can change this if application developers
prefer

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

Merge commit '24057c83207d6ea8bfd824155ac37be8a33dfd0c'

* commit '24057c83207d6ea8bfd824155ac37be8a33dfd0c':
  eacmv: check the framerate before setting it.

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

Merge commit '5569146d48f06564e8fa393424782cceed510916'

* commit '5569146d48f06564e8fa393424782cceed510916':
  adx: check that the offset is not negative

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

Merge commit 'a6a2282c25abe43e352010a7c3fbc92994c0bc1c'

* commit 'a6a2282c25abe43e352010a7c3fbc92994c0bc1c':
  rv30: fix extradata size check.

Conflicts:
libavcodec/rv30.c

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

Merge commit 'feded990e3ef9af4a0b827d5b6d8fe86f0b94942'

* commit 'feded990e3ef9af4a0b827d5b6d8fe86f0b94942':
  mpegvideo: set reference/pict_type on generated reference frames

Conflicts:
libavcodec/mpegvideo.c

The picture type is left at P type as it was explicitly set before

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

avformat/utils: fix order of buffers in timestamp update code

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

avcodec/mpegvideo: fix ac/dc_val and coded_block table sizes

With interlaced vc1 it was possible that accesses could happen outside these
tables before this.

Regression since 017e234c204f8ffb5f85a073231247881be1ac6f
Reproduced with a sample from Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Fixes (again) : 480i30__codec_WVC1__mode_2__framerate_29.970__type_2__preproc_17.SIGFPE.bfa.390.wmv
No releases are affected by this

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

avutil/mathematics: fix 2 typos in the doxy

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

doc/faq: remove "-profile option fails when encoding H.264 video with AAC audio" entry

The error was fixed in commit ce9bd303794fcc94aa232c116bece13c5994b55b
more than one year ago, and does not affect all the currently supported
versions.

In particular, fix trac issue #1535.

doc/ffserver: mention how to access streams through RTSP

mathematics: remove asserts from av_rescale_rnd()

It is a public function, it must not assert on its parameters.

eacmv: check the framerate before setting it.

Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
CC:libav-stable@libav.org

adx: check that the offset is not negative

Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
CC:libav-stable@libav.org

rv30: fix extradata size check.

It has been checking the number of bits in the offset instead of the
actual offset.

Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
CC:libav-stable@libav.org

mpegvideo: set reference/pict_type on generated reference frames

Otherwise the generic code will unref them, which can then result in
last_picture_ptr == current_picture_ptr, which causes deadlocks at least
in rv40.

Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
CC:libav-stable@libav.org

avcodec/avcodec: document that some video decoders do not support linesizes changing between frames.

Omission in the documentation found by: Sebastian Dröge
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

avformat/bink: display audio track ids

Signed-off-by: Peter Ross <pross@xvid.org>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

MAINTAINERS: add myself for spdif* and hls.c

Signed-off-by: Anssi Hannula <anssi.hannula@iki.fi>

avformat/hls: decouple playlists from variants

Not all "sub-playlists" are variant playlists (containing the same
content with a different bitrate, etc) in the current version of the HLS
specification. They can now also be alternative renditions, containing
e.g. alternative audio tracks etc.

Decouple playlists from variants to prepare for handling the new
features.

Signed-off-by: Anssi Hannula <anssi.hannula@iki.fi>

avformat/http: always allow no-op seek

This also allows checking stream position as per ffurl_seek() doxy.

Signed-off-by: Anssi Hannula <anssi.hannula@iki.fi>

avformat/bink: seek to first frame

Some rare bink files include unused bytes between the frame table index
and first frame data.

Fixes ticket #3266.

This patch has also been tested with non-seekable protocols.

Signed-off-by: Peter Ross <pross@xvid.org>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

matroskadec: Export the MuxingApp element value as metadata

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

ffmpeg: do not fail when options are routed to libavformat and libavcodec and only one can be used

Fixes setting frame_size for pulse demuxer

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

h264: Clear ERContext.cur_pic when unref'ing current picture.

Signed-off-by: Dale Curtis <dalecurtis@chromium.org>

avcodec/mace: check buffer size

Fixes use of uninitialized memory
Fixes: msan_uninit-mem_7f9d2775e090_8782_surge-2-8-MAC3.mov
Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

mp3on4: fail when the header check fails

It seems the code assumed that when one out of multiple blocks fail
some span of time is correct, its not, its some channels
that are correct

Fixes use of uninitialized memory
Fixes: msan_uninit-mem_7f44a03ba3ce_5692_id5_1.mp4
Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

avcodec/aacps: fix number of bands used with ipd/opd

Fixes use of uninitialized memory
Fixes: msan_uninit-mem_7f861d16355f_1664_File1_fixed.aac
Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

avcodec/iff: ensure that runs with insufficient input dont leave uninitialized bytes in the output

Fixes use of uninitialized memory
Fixes: msan_uninit-mem_7fa0dea15eae_8988_test.iff
Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

avformat/bink: recognize bink2 files

Support demuxing of audio streams in bink2 files.

Signed-off-by: Peter Ross <pross@xvid.org>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

doc/muxers/hls: change "can used" to "can be used"

Spotted-by: Alexander Strasser <eclipse7@gmx.net>

fate: Add OggVP8 demux test

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

atrac3plus: Add forgotten initialization of an internal struct

This patch also fixes trac ticket 3254.

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

doc/doxy: remove unused files

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

Merge remote-tracking branch 'qatar/master'

* qatar/master:
  Makefile: add html template files to the doxygen deps

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

doc/muxers/segment: clarify ambiguos reference

Replace "The segmenter muxer" with "This muxer". The "segmenter muxer"
was never defined before, and thus it is a slightly ambiguous term.

doc/muxers/segment: reference hls muxer

doc/muxers/hls: extend documentation

In particular, reference segment muxer and clarify difference between
segment filename number and playlist sequence number.

Should fix trac ticket #2601.

avformat/mux: fix "no tag found" check in validate_codec_tag()

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

avformat/vqf: check avio_read()s return value more completely

Fixes use of uninitialized memory
Fixes: msan_uninit-mem_7f180a523a71_5052_esvorbei_extd.vqf
Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

avcodec/vqavideo: use av_mallocz() for decode_buffer()

Fixes use of uninitialized memory
Fixes: msan_uninit-mem_7f62eaba897d_595_4D6EFA92.VQA
Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

Makefile: add html template files to the doxygen deps

configure: bump year number 2013 -> 2014

Happy new year!

doc/protocols/rtsp, lavf/rtsp: fix/extend options documentation

ffplay: add documentation for "s" key

With various edits suggested by Stefano Sabatini and Clément Bœsch.

avcodec/binkaudio: clear padding area of packet_buffer

Fixes use of uninitialized memory
Fixes: msan_uninit-mem_7f0dba198b34_2970_Snd0a3a2ad4.dee
Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

dxva2_vc1: signal skipped p frames

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

dxva2_vc1: fix signaling of intensity compensation values

lumscale/lumshift don't get reset back to their default values if
intensity compensation is not active, and a wrong signaling here can
cause playback issues.

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

vc1: set chromaformat = 1 for simple/main profile

1 is the only valid value for VC-1/WMV3, and setting it here makes sure
no invalid value is send to a hw accelerator, for example.

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

dxva2_vc1: set PQUANT as described by the 2010 spec update

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

dxva2_vc1: set bfraction in slice info according to spec

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

dxva2_vc1: set refdist value according to spec

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

avcodec/mpegvideo_enc: implement frame skip score normalization

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

avcodec/hevc: clear HEVClc when its deallocated in hevc_decode_free()

Fixes reading freed memory
Fixes: asan_heap-uaf_1abf8ef_3987_NUT_A_ericsson_4.bit
Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

avformat/version: bump micro for addition of internal field to AVStream

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

avformat: dont run update_initial_duration() twice

This should avoid floods of first_dts not matching debug messages

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

Avoid using empty macro arguments.

These are not supported by all compilers (gcc 2.95 but also older SPARC
compilers, see gcc bug #33304 for example), and there is no real need for them.
One use of this feature remains in libavdevice/v4l2.c which can't be
replaced quite as easily.

Signed-off-by: Reimar Döffinger <Reimar.Doeffinger@gmx.de>

avformat/id3v2: allow ID3 parsing without AVFormatContext

Add ff_id3v2_read_dict() for parsing without AVFormatContext, but
instead with AVIOContext and AVDictionary.

AVFormatContext is still used for logging, if available.

Chapter parsing is the only non-logging functionality that actually
needs AVFormatContext, and AFAICS it should be modified to write the
data to ID3v2ExtraMeta first, from where it can be implanted to
AVFormatContext by a separate function (like it is done with
read_apic() and ff_id3v2_parse_apic()). That is outside the scope of
this patch, though.

Signed-off-by: Anssi Hannula <anssi.hannula@iki.fi>

avformat/http: allow the caller to select a request range

Add AVOptions for setting the initial offset and the ending offset, so
they can be used for setting an appropriate Range header.

Signed-off-by: Anssi Hannula <anssi.hannula@iki.fi>

avformat/id3v2: parse ID3 Private frames as extra metadata

They are used in HLS.

Signed-off-by: Anssi Hannula <anssi.hannula@iki.fi>

avformat/mpegts: demux timed ID3 metadata

Used in some HLS streams ("Timed Metadata for HTTP Live Streaming").

This is just ID3 tags at arbitrary stream positions, but I still added
"timed" to the codec name to avoid confusion with regular non-stream ID3
tags.

Signed-off-by: Anssi Hannula <anssi.hannula@iki.fi>

avcodec/lagarith: check and propagate return value from init_get_bits8()

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

avcodec/lagarith: use init_get_bits8()

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

avcodec/lagarith: reenable buggy lag_decode_zero_run_line()

This is to prevent regressions in case the old code was able to partly
decode frames (no way to say without a testcase)
Add a memset to prevent use of uninitialized memory until we have a
testcase and can test/fix it

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

Merge remote-tracking branch 'cigaes/master'

* cigaes/master:
  lavc/mjpegenc: use proper error codes.
  lavc/mjpegenc: check av_frame_alloc() failure.
  lavc/libopenjpegenc: check av_frame_alloc() failure.
  lavc/diracdec: check av_frame_alloc() failure.
  lavc/utils: check av_frame_alloc() failure.
  ffprobe: check av_frame_alloc() failure.
  lavc/ffwavesynth: fix dependency sizeof(AVFrame).

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

af_aresample: remove only use of array compound literals with non-const initializers in FFmpeg.

Some older compilers might have particular trouble with them,
and they do not really seem worth it to me.

Signed-off-by: Reimar Döffinger <Reimar.Doeffinger@gmx.de>

configure: check that pthreads is compatible with compiler.

In particular the mutex initialization for example won't actually
compile with e.g. gcc 2.95.

Signed-off-by: Reimar Döffinger <Reimar.Doeffinger@gmx.de>

compat: provide va_copy for old gcc versions.

Since we have this compat/va_copy.h header already we might just as well make
use of it for more than one compiler.

Signed-off-by: Reimar Döffinger <Reimar.Doeffinger@gmx.de>

Merge remote-tracking branch 'qatar/master'

* qatar/master:
  lavu: Move preprocessor macros in a separate file

Conflicts:
libavutil/avutil.h
libavutil/utils.c
libavutil/version.h

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

lavc/mjpegenc: use proper error codes.

lavc/mjpegenc: check av_frame_alloc() failure.

lavc/libopenjpegenc: check av_frame_alloc() failure.

lavc/diracdec: check av_frame_alloc() failure.

lavc/utils: check av_frame_alloc() failure.

ffprobe: check av_frame_alloc() failure.

lavc/ffwavesynth: fix dependency sizeof(AVFrame).

oggdec: add support for VP8 demuxing

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

Merge remote-tracking branch 'cehoyos/master'

* cehoyos/master:
  Fix condition for transparency warning in xsub encoder.
  Allow hiding the banner.

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

avcodec/lagarith: fix init_get_bits() size in lag_decode_arith_plane()

untested due to lack of sample

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

avcodec/lagarith: fix src/src_size for esc_count < 8

untested due to lack of sample

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

avcodec/lagarith: disable lag_decode_zero_run_line() and ask for a sample

The code seems to have never been tested
fixing it should be quite easy but needs a sample/testcase

Fixes use of uninitialized memory
Fixes: msan_uninit-mem_7f9a862dfabf_413_2889_assassin_OL.avi
Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

Fix condition for transparency warning in xsub encoder.

Allow hiding the banner.

Fixes ticket #3246.

lavu: Move preprocessor macros in a separate file

And remove all the circular inclusions of avutil.h while at it.

Merge remote-tracking branch 'cigaes/master'

* cigaes/master:
  lavd/xv: report if no adaptor present.

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

Merge remote-tracking branch 'lukaszmluki/master'

* lukaszmluki/master:
  lavf/libssh: improve authentication
  lavf/libssh: fix file mode

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

lavd/xv: report if no adaptor present.

Merge remote-tracking branch 'cus/stable'

* cus/stable:
  ffplay: do not wait for the picture allocation to finish on exit
  ffplay: remove two unneeded av_free_packet calls
  ffplay: remove some unneded av_frame_unref calls
  ffplay: remove unneeded avcodec_get_frame_defaults
  ffplay: use precalculated frame size and bytes per sec values
  ffplay: precalculate audio output frame size and byte per sec

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

lavf/libssh: improve authentication

- Add authentication using keys
- Provide better message on fail

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

lavf/libssh: fix file mode

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

avformat/wc3movie: Check strings before printing.

Fixes use of uninitialized memory
Fixes: msan_uninit-mem_7f7812ca062f_2812_SC_32_part.MVE
Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

avformat/siff: check avio_read() return value before returning packet

Fixes: /ld/michael/ffmpeg_uninit/ffmpeg_uninit/done/msan_uninit-mem_7fb3e0fa86e9_1980_INTRO_B.VB
Fixes use of uninitialized memory
Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

ffplay: do not wait for the picture allocation to finish on exit

When SDL could not allocate a YUV overlay or open a window, the video thread
got locked up because it waited for the allocation to finish forever.

Reported-by: Carl Eugen Hoyos <cehoyos@ag.or.at>
Signed-off-by: Marton Balint <cus@passwd.hu>

ffplay: remove two unneeded av_free_packet calls

Signed-off-by: Marton Balint <cus@passwd.hu>

ffplay: remove some unneded av_frame_unref calls

av_buffersrc_add_frame implicitly unreferences the added frame.

Signed-off-by: Marton Balint <cus@passwd.hu>

ffplay: remove unneeded avcodec_get_frame_defaults

Signed-off-by: Marton Balint <cus@passwd.hu>

ffplay: use precalculated frame size and bytes per sec values

Signed-off-by: Marton Balint <cus@passwd.hu>

ffplay: precalculate audio output frame size and byte per sec

Signed-off-by: Marton Balint <cus@passwd.hu>

doc/encoders: add wavpackenc doc

Signed-off-by: Timothy Gu <timothygu99@gmail.com>

doc/encoders: reformat libwavpack documentation

Signed-off-by: Timothy Gu <timothygu99@gmail.com>

configure: remove git url check

This part of the script doesn't check if git command is available and produce error if not.
It is 2 years since address changed and it is more reasonable to remove it than fix it.

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