Merge commit '88b32673db39440422a73ec3047d3326c96b4fb2'

* commit '88b32673db39440422a73ec3047d3326c96b4fb2':
  avconv: copy stream-level side data when streamcopying

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

Merge commit 'c63418e0a3afbcdbc59fd65c270d45efafe092ce'

* commit 'c63418e0a3afbcdbc59fd65c270d45efafe092ce':
  doc: reword the mp3 muxer documentation

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

Merge commit '99143140dea12363af680d02e23cb42cfe191679'

* commit '99143140dea12363af680d02e23cb42cfe191679':
  mp3dec: fix reading the Xing tag

Conflicts:
libavformat/mp3dec.c

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

Merge commit '6df9d9b55d3f56ee7782639a7678eeeaf77f14ea'

* commit '6df9d9b55d3f56ee7782639a7678eeeaf77f14ea':
  lavf: Use av_gettime_relative

Conflicts:
libavformat/hls.c

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

Merge commit 'd0c093021943e9b9c23528b12cd61ca2a5b01b4f'

* commit 'd0c093021943e9b9c23528b12cd61ca2a5b01b4f':
  avconv: Use av_gettime_relative

Conflicts:
ffmpeg.c

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

Merge commit '248d8fb60c59c8e044d9c8f78f23383b7cdecf72'

* commit '248d8fb60c59c8e044d9c8f78f23383b7cdecf72':
  avplay: Use av_gettime_relative

Conflicts:
ffplay.c

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

Merge commit 'e205429fcf9de3182bce2f4cfd1d6401596a8666'

* commit 'e205429fcf9de3182bce2f4cfd1d6401596a8666':
  tools: Use av_gettime_relative

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

Merge commit '6fdf35fe35d8c1c467708238100648a7a47c930d'

* commit '6fdf35fe35d8c1c467708238100648a7a47c930d':
  lavc: Use av_gettime_relative

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

Merge commit '1bd0bdcdc236099d5c0d179696951f35f5310fa5'

* commit '1bd0bdcdc236099d5c0d179696951f35f5310fa5':
  lavu: Add av_gettime_relative

Conflicts:
libavutil/time.c
libavutil/time.h
libavutil/version.h

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

avconv: copy stream-level side data when streamcopying

doc: reword the mp3 muxer documentation

Make it more structured.

mp3dec: fix reading the Xing tag

The quality scale field is only supposed to be present if the fourth bit
is set. In practice, lame always sets it, but other tools might not.

CC:libav-stable@libav.org

lavf: Use av_gettime_relative

The ones left using av_gettime are NTP timestamps (for RTCP,
which is specified to send the actual current realtime clock
in RTCP SR packets), and the NUT muxer timestamper, which is
documented as using wallclock time.

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

avconv: Use av_gettime_relative

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

avplay: Use av_gettime_relative

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

tools: Use av_gettime_relative

Whenever av_gettime() is used to measure relative period of time,
av_gettime_relative() is prefered as it guarantee monotonic time
on supported platforms.

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

lavc: Use av_gettime_relative

Whenever av_gettime() is used to measure relative period of time,
av_gettime_relative() is prefered as it guarantee monotonic time
on supported platforms.

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

lavu: Add av_gettime_relative

Since av_gettime() is used in a number of places where actual
real time clock is required, the monotonic clock introduced in
ebef9f5a5 would have consequences that are hard to handle. Instead
split it into a separate function that can be used in the cases
where only relative time is desired.

On platform where no monotonic clock is available, the difference
between the two av_gettime functions is not clear, and one could
mistakenly use the relative clock where an absolute one is
required. Therefore add an offset, to make it evident that the
time returned from av_gettime_relative never is actual current
real time, even though it is based on av_gettime.

Based on a patch by Olivier Langlois.

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

avformat/rtsp: pass return code from ffurl_open() on its failure

Previously, AVERROR(EIO) was returned. Now the value is passed from
lower level, thus it is possible to distinguish ECONNREFUSED, ETIMEDOUT,
ENETUNREACH etc.

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

avformat/rtsp: add av_assert0() to clarify that the else case is supposed to be unreachable

If its reachable then theres a bug as err would be uninitialized

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

Merge remote-tracking branch 'cehoyos/master'

* cehoyos/master:
  Print an error if -r and -vsync 0 are used together.

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

avcodec/utils: Print the codec name that is missing on the whitelist

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

Print an error if -r and -vsync 0 are used together.

Fixes ticket #4041.

avcodec/options_table: Fix codec_whitelist flags

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

avformat/http: pass return code from http_open_cnx_internal() on its failure

Previously, AVERROR(EIO) was returned on failure of
http_open_cnx_internal(). Now the value is passed to upper level, thus
it is possible to distinguish ECONNREFUSED, ETIMEDOUT, ENETUNREACH etc.

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

avformat/concatdec: Forward whitelists to the subdemuxers.

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

Forward whitelists to the asf demuxer

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

avformat/avidec: Forward whitelists to the subtitle demuxer

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

avformat/mpeg: Forward whitelists to the mpegps demuxer

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

avformat/libquvi: Forward whitelists to subdemuxer

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

x86/hpeldsp: fix loop in {avg,avg_no_rnd}_pixels16_x2_mmx

Handle it inside the __asm__() block.
Fixes fate-vc1_ilaced_twomv when using the gcc-usan toolchain.

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

avformat/sapdec: Forward whitelists to sdp demuxer

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

avformat/hls: forward whitelists to mpegts demuxer

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

avutil/avstring: fix hardcoded separator in av_match_list()

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

avutil/avstring: Reimplement av_match_list()

av_match_list() is only used for whitelists, fix it so it works with
multi-named formats like "mov,mp4,m4a,3gp,3g2,mj2"

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

avformat/format: Use av_match_name() instead of list in av_match_ext()

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

Added STL demuxer and decoder

Signed-off-by: Clément Bœsch <u@pkh.me>

ffserver_conf: factorize parse function per config tag

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

ffserver_config: clean up variable initialization

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

ffserver: move configuration code to separate file

This commit doesn't change any existing logic.
It moves ffserver configuration related code to separate file.
It intends to make maintaining easier.

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

avcodec/tiffenc: properly compute packet size

The bytes per row is a better indication of it.

Helps resolving ticket #3874 by fixing ffmpeg's encoder and transforming
the issue in a issue with non-compliant decoders. ffmpeg's one is ok,
but unfortunately, many others aren't handling correctly unusual chroma
samplings.

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

ffmpeg: avoid endlessly reading from one input while another is unavailable

Testcase in Ticket 4051

Reviewed-by: Nicolas George <george@nsup.org>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

avformat/mux: Fix assertion failure due to max_interleave_delta and poor input

Fixes Ticket4051

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

avfilter/vf_idet: Fixes issue with idet not flushing last frame.

Uses a similar approach as vf_yadif to flush the last frame in idet.

Quick test with 50 frames from vsynth1:
./ffmpeg.old -i fate-suite/ffmpeg-synthetic/vsynth1/%02d.pgm -vf idet -f mp4 -y /dev/null 2>&1  | grep Multi
 (gives) [Parsed_idet_0 @ 0x261ebb0] Multi frame detection: TFF:0 BFF:0 Progressive:48 Undetermined:1

./ffmpeg -i fate-suite/ffmpeg-synthetic/vsynth1/%02d.pgm -vf idet -f mp4 -y /dev/null 2>&1  | grep Multi
 (gives) [Parsed_idet_0 @ 0x35a0bb0] Multi frame detection: TFF:0 BFF:0 Progressive:49 Undetermined:1

Fate tests have been updated.

(In testing, it seems this filter will also need a subsequent patch for single frame input)

Signed-off-by: Neil Birkbeck <neil.birkbeck@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

avformat/matroskadec: Fix cluster parsing loop which gathers seek information

Fixes Ticket2263
Fixes Ticket3934

Reviewed-by: Rodger Combs <rodger.combs@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

tools/crypto_bench: add CAST5 support

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

avcodec/mjpegdec: use FF_CEIL_RSHIFT() for width

No testcase known

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

lavf/cinedec: Fix a typo in the file header.

Merge commit 'af7ca6ea124b82b337a6b96e10963e88eba57ebe'

* commit 'af7ca6ea124b82b337a6b96e10963e88eba57ebe':
  nutdec: check av_new_packet return value

Conflicts:
libavformat/nutdec.c

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

Merge commit 'b69183f65d0f6f4cd7a4e6c0deb57d59b0185aba'

* commit 'b69183f65d0f6f4cd7a4e6c0deb57d59b0185aba':
  nutenc: check for negative index rather than assert

Conflicts:
libavformat/nutenc.c

Not merged, the assert is correct

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

Merge commit 'be42c0b8d57fe2ea769892d102ffd5561dc18709'

* commit 'be42c0b8d57fe2ea769892d102ffd5561dc18709':
  rmdec: stricter error check to avoid theoretical unitialized use

Conflicts:
libavformat/rmdec.c

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

Merge commit '7207dd8f829baee58b4df6c97c19ffde77039e8d'

* commit '7207dd8f829baee58b4df6c97c19ffde77039e8d':
  rmdec: check av_new_packet return value

Conflicts:
libavformat/rmdec.c

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

lavd/fbdev_common: report error during probing fbdev device

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

lavd/fbdev_dec: use default device when not provided

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

Merge commit '629b2ed0ac77d7c4bf1aeac5e70cafee5fa0fcae'

* commit '629b2ed0ac77d7c4bf1aeac5e70cafee5fa0fcae':
  flvdec: make sure to check create_stream and report the same error

Conflicts:
libavformat/flvdec.c

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

Merge commit 'f22aa6b841dc54fa1dd804303885b1e230a5f629'

* commit 'f22aa6b841dc54fa1dd804303885b1e230a5f629':
  flvdec: avoid unitialized use of a struct member

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

Merge commit 'e73d26bbd65f1ac5fc73ef3fd24cab1bed8ba2e2'

* commit 'e73d26bbd65f1ac5fc73ef3fd24cab1bed8ba2e2':
  smoothstreamingenc: explict cast to avoid overflow

Conflicts:
libavformat/smoothstreamingenc.c

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

Merge commit '04d8af5f17961b9b7076b8c974e360feb08787c2'

* commit '04d8af5f17961b9b7076b8c974e360feb08787c2':
  fate-mpeg4: use TARGET_SAMPLES for resize tests

Conflicts:
tests/fate/mpeg4.mak

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

avcodec/mjpegdec: simplify chroma_height calculation

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

mov.c: reasonable bitrate for fragmented mp4

If using MFRA for timestamps, the stream may start from a large offset
and/or have gaps. With this change we calculate the bitrate based on
frames we've seen.

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

avcodec/mjpegdec: Support 24111100 pix fmt id

Fixes 129533924_640.jpg

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

nutdec: check av_new_packet return value

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

nutenc: check for negative index rather than assert

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

rmdec: stricter error check to avoid theoretical unitialized use

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

rmdec: check av_new_packet return value

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

flvdec: make sure to check create_stream and report the same error

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

flvdec: avoid unitialized use of a struct member

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

smoothstreamingenc: explict cast to avoid overflow

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

doc/ffmpeg.texi: document the new -start_at_zero option

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

lavfi/concat: accept a single segment

Simplify scripting operations, so that n=1 is not to be considered as a
special case.

lavfi/afade: fix cur_sample computation

Use the correct timebase conversion.

lavf/mov.c: Prevent memory leak in case of invalid metadata reads.

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

fate-mpeg4: use TARGET_SAMPLES for resize tests

avformat/rtsp: Use ff_rtsp_averror()

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

avformat/rtspcodes: introduce ff_rtsp_averror()

Currently this is another name for ff_http_averror()

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

ffmpeg_opt: Add -start_at_zero option.

This automatically shifts input timestamps to start at 0 instead of the file's
starting timestamp when using -copyts.

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

avcodec/libutvideodec: print extradata size if unsupported

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

Merge commit 'd2771a1dc0a3695e8873adc16d068077f2417eea'

* commit 'd2771a1dc0a3695e8873adc16d068077f2417eea':
  rtpproto: Free the addrinfo pointer on failure

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

Merge commit '96bfb677478514db73d1b63b4213c97ad4269e8f'

* commit '96bfb677478514db73d1b63b4213c97ad4269e8f':
  nutdec: Prevent a memory corruption

Conflicts:
libavformat/nutdec.c

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

Merge commit '350ed1829268d343b791208c8fd1cddd44d52a8e'

* commit '350ed1829268d343b791208c8fd1cddd44d52a8e':
  rtpdec_hevc: drop unnecessary check

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

Merge commit '322b571d5591978efd6f6fee12181ac8900079fe'

* commit '322b571d5591978efd6f6fee12181ac8900079fe':
  rtmpproto: remove dead code

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

Merge commit 'd1afd3e1d6e43f4d37ae147091f270124ac48e04'

* commit 'd1afd3e1d6e43f4d37ae147091f270124ac48e04':
  vf_format: check input validity

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

lavd: export all symbols with av_ prefix

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

Merge commit '7b48bf95242ebf95366d24d32e4cfca6aa77c5e2'

* commit '7b48bf95242ebf95366d24d32e4cfca6aa77c5e2':
  wtv: clean memory on error

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

Merge commit '9fbc613f0df1628e7e78bca791fa8833846f8210'

* commit '9fbc613f0df1628e7e78bca791fa8833846f8210':
  wtv: check seek_by_sector return value

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

Merge commit 'd7f530b0d67fe3996dbfa990a47c865e0d1400a2'

* commit 'd7f530b0d67fe3996dbfa990a47c865e0d1400a2':
  aviobuf: check context before using it

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

Merge commit '02484d1a9316a9309fc1830825345ab79f6a8d60'

* commit '02484d1a9316a9309fc1830825345ab79f6a8d60':
  avio: fix sizeof argument

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

Merge commit '8ab3b71e4b343cec3fa369a880ab4496d7345154'

* commit '8ab3b71e4b343cec3fa369a880ab4496d7345154':
  idcin: fix return check

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

configure: fix bug to ensure that HAVE_VSX is only enabled when HAVE_ALTIVEC is enabled and in LE environment

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

lavf/mov.c: Allocate buffer in case of long metadata entries.

Fixes ticket #4018

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

v4l2: Make use of the VIDIOC_ENUM_FRAMESIZES ioctl on OpenBSD

Make use of the V4L2 VIDIOC_ENUM_FRAMESIZES ioctl on OpenBSD.

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

avfilter/vf_idet: add both multiple and single frame detection metadata

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

rtpproto: Free the addrinfo pointer on failure

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

nutdec: Prevent a memory corruption

Chapters do not have an event_flags field.

Bug-Id: CID 1231990

rtpdec_hevc: drop unnecessary check

len is always >=1 in that case.

Bug-Id: CID 1238784

rtmpproto: remove dead code

Expression already evaluated before, redundant since
053386864219eccbcca1886c55f902f9555428a5.

Bug-Id: CID 732199

vf_format: check input validity

CC: libav-stable@libav.org

wtv: clean memory on error

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

wtv: check seek_by_sector return value

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

aviobuf: check context before using it

Avoid a possible null pointer dereference.

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