* qatar/master:
  h264: check that an IDR NAL only contains I slices
Merged-by: Michael Niedermayer <michaelni@gmx.at>

* commit '9ecabd78':
  h264: reset num_reorder_frames if it is invalid

Note, num_reorder_frames is not used in the failure case
Merged-by: Michael Niedermayer <michaelni@gmx.at>

* commit '0652e024':
  h264: reset ref count if decoding the slice header fails
Merged-by: Michael Niedermayer <michaelni@gmx.at>

* commit '98cc9efc':
  h264: prevent two matching fields from being both a short/long ref combination

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

* commit '00dbff4c':
  h264: do not call field_end if we do not have a current picture
Merged-by: Michael Niedermayer <michaelni@gmx.at>

* commit '7f0e81db':
  h264: limit allowed pred modes in ff_h264_check_intra_pred_mode() to 3

Conflicts:
	libavcodec/h264.c

See: d6a33f5d
See: 2005fddcMerged-by: Michael Niedermayer <michaelni@gmx.at>

* commit 'd1b3fabe':
  h264: reset first_field if frame_start() fails for missing refs

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

* commit '21088111':
  Prepare for 10_alpha2 Release

Conflicts:
	RELEASE

Not merged
Merged-by: Michael Niedermayer <michaelni@gmx.at>

Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
CC:libav-stable@libav.org

An invalid VUI is not considered a fatal error, so the SPS containing it
may still be used. Leaving an invalid value of num_reorder_frames there
can result in writing over the bounds of H264Context.delayed_pic.

Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
CC:libav-stable@libav.org

Otherwise the ER code might try to use some already freed references.

Fixes possible access to freed memory.

Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
CC:libav-stable@libav.org

Fixes possible access to freed memory.

Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
CC:libav-stable@libav.org

Fixes invalid reads.

Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
CC:libav-stable@libav.org

Higher modes are not allowed for 16x16/chroma, which is what this
function is used for. Otherwise this function would return 0 (vertical
prediction) for invalid higher modes, which could result in invalid
reads.

Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
CC:libav-stable@libav.org

In this case we may not have a current frame, while first_field being
set implies we do.

Fixes invalid reads.

Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
CC:libav-stable@libav.org

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

pavgb is an sse integer instruction, so the mmxext flag is enough
Signed-off-by: James Almer <jamrial@gmail.com>
Reviewed-by: "Ronald S. Bultje" <rsbultje@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

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

Work around yasm's inefficiency with handling large numbers of variables
in the global scope.

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

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

Fixes muxing frames after av_interleaved_write_frame() failure
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

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

No testcase but it seems logic to stop when finished is set
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

This avoids finished output streams continuing to receive frames
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 out of array access with RC_VARIANCE set to 0
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

Its said that there was a mpeg4 sample with the same fourcc, but noone has it
if someone finds it please tell me so i can fix detection of both.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

* cehoyos/master:
  Fix libxvid crash on failing initialisation.
Merged-by: Michael Niedermayer <michaelni@gmx.at>

* qatar/master:
  avisynth: fix setting packet properties

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

* commit '104a97be':
  buffersrc: handle non-refcounted frames in av_buffersrc_add_frame() correctly

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

* commit '5ef11b8d':
  yuv4mpeg: set average frame rate
Merged-by: Michael Niedermayer <michaelni@gmx.at>

* commit '2ce8bca5':
  avconv: print a warning when falling back to default 25fps

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

* commit '33018907':
  mp3enc: allow omitting the id3v2 header with -id3v2_version 0

Conflicts:
	doc/muxers.texi
	libavformat/version.h
Merged-by: Michael Niedermayer <michaelni@gmx.at>

* commit 'f9cc6883':
  mp3enc: add an option for disabling the Xing frame.

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

* commit '045654f4':
  doxy: Document better the available AVFrame flags
Merged-by: Michael Niedermayer <michaelni@gmx.at>

* commit 'ff23c4e4':
  doxy: Add AVFrame to the structured modules

Conflicts:
	libavutil/frame.h
Merged-by: Michael Niedermayer <michaelni@gmx.at>