Alternatively every fate test could be changed to pass both fflags and flags +bitexact
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

* commit '6656370b':
  avconv: set the "encoder" tag when transcoding

Conflicts:
	ffmpeg.c
	tests/ref/lavf/mkv
	tests/ref/seek/lavf-mkv
Merged-by: Michael Niedermayer <michaelni@gmx.at>

* commit 'd246231e':
  wavenc: use codec descriptors to get the codec name

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

* commit '968a62a9':
  doc/APIchanges: mark the release 10 branch point

Conflicts:
	doc/APIchanges

Not merged, as there was no such branch in ffmpeg
Merged-by: Michael Niedermayer <michaelni@gmx.at>

* commit '33082af7':
  doc/APIchanges: fill in missing hashes and dates

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

Also, return a proper error code.

Fix trac ticket #3603.
Signed-off-by: Stefano Sabatini <stefasab@gmail.com>

By default, macro EPEL_FILTER loads the coefficients inconditionally
into m14/m15. This forces an unneeded higher register count.

Reduce that count by making them parameters of EPEL_FILTER.
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.

Since v4l2 is compiled only on Linux where av_gettime_relative()
is monotonic, a small wrapper function av_gettime_monotonic() is used
(should be inlined the compiler) to put emphasis on that fact.
Signed-off-by: Olivier Langlois <olivier@trillion01.com>
Reviewed-by: Nicolas George <george@nsup.org>
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>

* 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.