* commit '37b3361e':
  mpeg12enc: factor out check in encode_dc
Merged-by: Michael Niedermayer <michaelni@gmx.at>

* commit '0a666470':
  mpegvideo_enc: factor out denominator and explicitly cast operands

Conflicts:
	libavcodec/mpegvideo_enc.c

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

* commit 'e0a1d0a2':
  mpegvideo_enc: rework direct mode check

Conflicts:
	libavcodec/mpegvideo_enc.c

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

Makes coverity less confused and the code more readable.

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

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

Remove stray semicolon and share codepaths.

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

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

We now use 'pixelformat' for V4L2_PIX_FMT_* (as they do in v4l2
documentation) and 'pix_fmt' for AVPixelFormat.

No functional change in the code.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

No testcase available but this seems more correct
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 "warning: passing argument 1 of avpriv_split_xiph_headers discards const qualifier from pointer target type"
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

* commit '05e59135':
  nutdec: do not set has_b_frames

Not merged, this change is not correct
Merged-by: Michael Niedermayer <michaelni@gmx.at>

* commit 'acc897e6':
  lavc: make avpriv_flac_is_extradata_valid() private on the next bump
Merged-by: Michael Niedermayer <michaelni@gmx.at>

* commit 'e839de0f':
  oggenc: accept only STREAMINFO extradata
Merged-by: Michael Niedermayer <michaelni@gmx.at>

* commit 'c070a875':
  lavc: make avpriv_flac_parse_streaminfo() private on the next bump
Merged-by: Michael Niedermayer <michaelni@gmx.at>

* commit '7784f477':
  lavf: stop using avpriv_flac_parse_streaminfo()

Conflicts:
	libavcodec/Makefile
Merged-by: Michael Niedermayer <michaelni@gmx.at>

* commit '56dc46a1':
  riffenc: do not fall back on AVCodecContext.frame_size for MP3
Merged-by: Michael Niedermayer <michaelni@gmx.at>

* commit '91e8d2eb':
  lavf: use the format context strict_std_compliance instead of the codec one

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

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

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

* commit '2f3fadfb':
  lavc,lavf: switch to the new vorbis parse API

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

The other functions where changed in the previous merge
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

* commit '5e80fb7f':
  lavc: add a public API for parsing vorbis packets.

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

* commit '6896f95b':
  vorbis_parser: add an AV prefix to VorbisParseContext

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

* commit '87479264':
  vorbis_parser: use a dedicated AVClass for logging

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

It is not supposed to be set by demuxers.

The reasoning is the same as for
0097cbea.

The only parameters needed by the demuxers are the sample rate and sample
count, which can be trivially extracted manually, without resorting to
an avpriv function.

It will not be set unless the codec context is used as the encoding
context, which is discouraged. For MP2, av_get_audio_frame_duration()
will already set the frame size properly. For MP3, set the frame size
explicitly.

It is required by (at least) the ogg demuxer.

Mark the current semi-public apriv API for removal.

This is done in preparation for making it public.

Currently, the API takes an external AVCodecContext, which is used only
for extradata and logging. This change will allow to it to work without
an AVCodecContext in the following commits.

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

Get the heartbeat working when the video has negative timestamps.

Fix trac ticket #4062.
Signed-off-by: Nicolas George <george@nsup.org>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>