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

* commit '79f2c426':
  dv: do not set codec timebase

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

* commit '93afb6c9':
  avconv: set output avg_frame_rate when known

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

* commit '7a5f4f68':
  lavf: extend avg_frame_rate documentation.
Merged-by: Michael Niedermayer <michaelni@gmx.at>

* commit 'c3311d47':
  avienc: sanitize variable naming in write_header()

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

* commit 'ab3fdaa7':
  yop: only set extradata size after it has been successfully allocated

Conflicts:
	libavformat/yop.c

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

* commit 'b513bf6f':
  yuv4mpegdec: do not set coded_frame properties

Conflicts:
	libavformat/yuv4mpegdec.c

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

* commit 'e4dc1000':
  yuv4mpeg: split the demuxer and muxer into separate files

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

* commit '3ef6c526':
  a64: check that extradata exists before reading from it
Merged-by: Michael Niedermayer <michaelni@gmx.at>

* commit 'b1365649':
  a64: remove unneeded struct qualifier
Merged-by: Michael Niedermayer <michaelni@gmx.at>

* commit 'd256ed78':
  4xm: allocate extradata properly.
Merged-by: Michael Niedermayer <michaelni@gmx.at>

* commit 'fd056029':
  lavc: add avcodec_free_context().

Conflicts:
	doc/APIchanges
	libavcodec/version.h
Merged-by: Michael Niedermayer <michaelni@gmx.at>

* commit 'e1b66778':
  lavc: remove the locking code in avcodec_close()

Conflicts:
	libavcodec/utils.c

Note, if someone knows of a external codec lib/API, hwaccel or other that requires
locking on its close/free side, please contact ffmpeg-devel.
Merged-by: Michael Niedermayer <michaelni@gmx.at>

It is not supposed to be set from outside of libavcodec.
Set average framerate instead.

Do not call an AVCodecContext 'stream', that is highly confusing.
Also, add a local variable for the current AVStream in the loop over all
streams.

Do not leave a non-zero extradata_size set on failure

coded_frame is not meant to be changed from outside of lavc, and is not
used for decoding.
Set AVCodecContext.field_order instead.

Pad it with the required amount of zeros, check for malloc failure.

Right now, the caller has to manually manage some allocated
AVCodecContext fields, like extradata or subtitle_header. This is
fragile and prone to leaks, especially if we want to add more such
fields in the future.

The only reason for this behaviour is so that the AVStream codec context
can be reused for decoding. Such reuse is discouraged anyway, so this
commit is the first step to deprecating it.

This function should not modify any global state, so there should be no
reason for any locking.

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

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

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

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

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

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

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

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: Olivier Langlois <olivier@trillion01.com>
Reviewed-by: Marton Balint <cus@passwd.hu>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

* commit '584f8840':
  riff: Pass block_align to estimate frame duration
Merged-by: Michael Niedermayer <michaelni@gmx.at>

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: Olivier Langlois <olivier@trillion01.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

The parser is needed. FATE breaks if not present.

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: Olivier Langlois <olivier@trillion01.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

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: Olivier Langlois <olivier@trillion01.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

These functions are using the POSIX clock_gettime() function with the
CLOCK_MONOTONIC clock id. If these are not present on the targeted
platform, the new functions will fallback on using the original realtime functions
av_gettime() and av_usleep().

Monotonic support can be added on other platforms with their
equivalent native system API eventually if possible.

Whenever time is requested to measure relative time, the monotonic clock,
when available, is superior to the system realtime clock because it is
not affected by discontinuous jumps in the system time

In a future step, offering the flexibility to let the user choose between
rt and monotonic clock for avdevices packets will be investigated.

It is very easy to experience the issues that this patch attempt to address
by rewinding back in the past the system time while ffmpeg is running.

this is breaking the ffmpeg report printing (ffmepg.c:print_report()) and
the the rate emulator functionality (-re) without the patch.
Signed-off-by: Olivier Langlois <olivier@trillion01.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>