* commit '7785ce1c':
  lavf: replace rename() with ff_rename()

Conflicts:
	libavformat/hdsenc.c
	libavformat/internal.h

See: 95d2fc6aMerged-by: Michael Niedermayer <michaelni@gmx.at>

* commit '0b66fb45':
  flac_picture: prevent a possible out of bound write

This is only partly merged, the condition this checks for
is impossible to be true as it would imply avio_read() to
read more than the size passed to it

See: 731f7eaaMerged-by: Michael Niedermayer <michaelni@gmx.at>

* commit 'f1ed83e2':
  img2dec: check av_new_packet return value

Conflicts:
	libavformat/img2dec.c

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

* commit '1967cd4e':
  audiointerleave: check av_new_packet return value

Conflicts:
	libavformat/audiointerleave.c

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

* commit 'ac84c1ce':
  avfilter: check filter link validity

Conflicts:
	libavfilter/avfilter.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>

The new function wraps errno so that its value is correctly reported
when other functions overwrite it (eg. in case of logging).

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

At "mimetype[len] = 0;" mimetype is a 64 element array and len might be
equal to or greater than that.

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

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

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

Remove now redundant check.

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

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

Based on ConvertToPlanar() from libutvideo
libutvideo sadly does not seem to support exporting its internal planar buffers
Reviewed-by: Benoit Fouet <benoit.fouet@free.fr>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

This has also been independently found and fixed similarly by carl in
f4a3bbf4a3cd375121ea2495817f3e50e831ed48
The 2nd magic check is taken from carls implementation
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

Fixes potential security issue in case of running out of memory

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

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

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

avformat/mp3enc: Squeeze our mp3 encoder tag into the 9byte shortname instead of randomly truncating
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

* commit 'ef363ebd':
  mp3enc: write full LAME frame

Conflicts:
	libavformat/mp3enc.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>

* commit '88b32673':
  avconv: copy stream-level side data when streamcopying
Merged-by: Michael Niedermayer <michaelni@gmx.at>

* commit 'c63418e0':
  doc: reword the mp3 muxer documentation
Merged-by: Michael Niedermayer <michaelni@gmx.at>

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

Conflicts:
	libavformat/mp3dec.c

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

* commit '6df9d9b5':
  lavf: Use av_gettime_relative

Conflicts:
	libavformat/hls.c

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

* commit 'd0c09302':
  avconv: Use av_gettime_relative

Conflicts:
	ffmpeg.c

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

* commit '248d8fb6':
  avplay: Use av_gettime_relative

Conflicts:
	ffplay.c

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

* commit 'e205429f':
  tools: Use av_gettime_relative

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

* commit '6fdf35fe':
  lavc: Use av_gettime_relative

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

* commit '1bd0bdcd':
  lavu: Add av_gettime_relative

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

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

Most importantly, it contains the encoder delay and replaygain info.

Make it more structured.

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

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>

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

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

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>

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>

Since av_gettime() is used in a number of places where actual
real time clock is required, the monotonic clock introduced in
ebef9f5a 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>

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>

If its reachable then theres a bug as err would be uninitialized
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

* cehoyos/master:
  Print an error if -r and -vsync 0 are used together.
Merged-by: Michael Niedermayer <michaelni@gmx.at>