* commit '30dfc1da':
  cws2fws: Close file handles on error
Merged-by: Michael Niedermayer <michaelni@gmx.at>

* commit 'a9b2a511':
  avconv_opt: Check localtime() return value

Conflicts:
	ffmpeg_opt.c

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

* commit '8a78ae2d':
  segment: Check open_null_ctx() return value
Merged-by: Michael Niedermayer <michaelni@gmx.at>

* commit 'b7a4127a':
  h264_qpel: Use the correct header
Merged-by: Michael Niedermayer <michaelni@gmx.at>

* commit '5e87080f':
  h264_weight: Fix SSSE3 biweight code with weights of 128

Conflicts:
	libavcodec/x86/h264_weight.asm

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

* commit '64a2e844':
  eamad: Use the correct headers
Merged-by: Michael Niedermayer <michaelni@gmx.at>

* commit '8606e881':
  mpeg12: Move the vlc bits to a stand alone file
Merged-by: Michael Niedermayer <michaelni@gmx.at>

* commit 'f1fa1eed':
  mpegvideo: Expand macro
Merged-by: Michael Niedermayer <michaelni@gmx.at>

Inconsistencies between the dimensions/pixel format of avctx and the
frame can confuse API users.
For example this can crash the demuxing_decoding example.

Back up the previous values and restore them, when decoding the next
frame. This is necessary, because these can be different between the
returned frame and the last decoded frame.
Reviewed-by: Michael Niedermayer <michaelni@gmx.at>
Signed-off-by: Andreas Cadhalpun <Andreas.Cadhalpun@googlemail.com>

* commit 'e7af52a6':
  mpegvideo: rv10: Move function declaration to a separate header
Merged-by: Michael Niedermayer <michaelni@gmx.at>

* commit 'e3d0f49a':
  mpegvideo: h263: Move all tables to a single file

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

* commit '8b5007a3':
  mpegvideo: Move ER functions to a separate file

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

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

Fixes Ticket2345
Reviewed-by: Paul B Mahol <onemda@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

Signed-off-by: Paul B Mahol <onemda@gmail.com>

Some files have SeekHead elements with broken IDs. They mismatch with
the ID of the destination element. These files are written by
"IDMmkvlib0.1" (as identified by the MuxingApp and WritingApp elements),
and the SeekHead IDs are actually endian-swapped.

This confuses the SeekHead logic of the demuxer. It will read some
elements twice, because the SeekHead ID is used to identify and remember
already read elements. With the file at hand, the stream list was
duplicated by reading the Tracks element twice.

Fix this by rejecting invalid EBML IDs in SeekHead entries. (This fix is
relatively specific to the broken file at hand, and doesn't protect
against some other cases of broken SeekHead, such as valid but
mismatching target element IDs.)
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

Signed-off-by: Paul B Mahol <onemda@gmail.com>

Reported-By: infer

Reported-By: infer

Reported-By: infer

CC: libav-stable@libav.org
Sample-Id: test_bref.mp4
Signed-off-by: Vittorio Giovara <vittorio.giovara@gmail.com>

The existence of such element does not represent an error
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

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

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

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

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

This may help static analyzers, the pixel format is checked
during initialization
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

We only look up pixel formats from a fixed list so none should ever
fail to be found
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

Based on patch by Wolfgang Lorenz <wl-chmw@gmx.de>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

Fixes fate tests on PPC64be
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

Untangle eamad from the mpeg12.h header and speed up rebuilding.

Having this macro in an header only facilitates the use of such header.
The code increase is minimal and files have one less dependency
on mpegvideo.h.

Fixes part of Ticket 4605
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

It seems to be working now
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

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