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

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>

This is a regression, previous code did not require
users to set the profile to use VDPAU.
In addition, ASP is a superset of SP, so there is not
even a good reason to require it.
Signed-off-by: Reimar Döffinger <Reimar.Doeffinger@gmx.de>

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

Fixes build on somewhat odd setups with mingw
Fixes Ticket4075
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

This can be useful for determining telecine.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

(This fixes ticket #1501)
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

* commit 'a4903911':
  rtmpproto: Ignore errors from the getStreamLength method

Conflicts:
	libavformat/rtmpproto.c

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

It is never an error if this method failed. If rt->live was
explicitly set to 0 (known to be a recorded file), print it
as a warning, otherwise print it as a debug message.

Based on a patch by Michael Niedermayer.
Signed-off-by: Martin Storsjö <martin@martin.st>

Replace "frames to record" with "frames to output". The "to record"
makes it seem like an input option, or that it would capture the frames
instead of outputting them.
Reviewed-by: Timothy Gu <timothygu99@gmail.com>
Signed-off-by: Lou Logan <lou@lrcd.com>

* commit '4ff670d9':
  hwaccel: Deinitialize hardware acceleration early enough
Merged-by: Michael Niedermayer <michaelni@gmx.at>

Fixes initial wtv dimensions
Fixes Ticket4070
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

Fixes fate on hppa.
Found-by: Andreas Cadhalpun.

* commit '77ab341c':
  aacdec: add default case in channel layout

Conflicts:
	libavcodec/aacdec.c

Note, the default case is currently unreachable

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

The application will destroy the underlying hardware handles when
get_format() gets called again. Also this ensures the
deinitialization takes place if the get_format callback returns an
error.

Regression from 1c80c9d7.
Signed-off-by: Luca Barbato <lu_zero@gentoo.org>

* commit '930ffd46':
  aacsbr: change order of operation to prevent out of array read

Conflicts:
	libavcodec/aacsbr.c

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

* commit '9f6f4074':
  aacsbr: treat 1-d arrays as such
Merged-by: Michael Niedermayer <michaelni@gmx.at>

* commit 'f52b8717':
  celp_filters: don't use filter lenght as loop bound

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

* commit 'c442190a':
  error_resilience: initialize prev_* variables

Note, these variables are not used without initialization prior
to the change
Merged-by: Michael Niedermayer <michaelni@gmx.at>

* commit '240b22af':
  motion_est: remove dead code
Merged-by: Michael Niedermayer <michaelni@gmx.at>

* commit '351d0f8b':
  get_bits: remove unused assignment

Conflicts:
	libavcodec/get_bits.h

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