* commit 'ac1fc92e':
  vc1dec: move setting repeat_pict after frame_start() has been called.

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

* commit '282c6a1a':
  mpegvideo: make ff_release_unused_pictures() static
Merged-by: Michael Niedermayer <michaelni@gmx.at>

* commit 'c99307ca':
  mpegvideo: make frame_size_alloc() static.
Merged-by: Michael Niedermayer <michaelni@gmx.at>

* commit '0b0a7a75':
  mpegvideo: move encode-only parts of common_end() to encode_end()

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

* commit 'd0d111d0':
  mpegvideo: remove commented out cruft from ff_MPV_frame_end()

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

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

* commit '381a7225':
  mpegvideo: split the encoding-only parts of ff_MPV_frame_end() into a separate function

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

* commit 'b7254288':
  mpegvideo: do not update last_non_b_pict_type in update_thread_context()
Merged-by: Michael Niedermayer <michaelni@gmx.at>

* commit '1f8eb690':
  mpegvideo: move encoding-only initialization from common_init() to encode_init()

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

* commit 'bedf952b':
  mpegvideo: move setting encoding-only vars from common_defaults() to encode_defaults()
Merged-by: Michael Niedermayer <michaelni@gmx.at>

* commit '2cab011f':
  mpegvideo: don't copy input_picture_number in update_thread_context()
Merged-by: Michael Niedermayer <michaelni@gmx.at>

* commit 'ff7ffe48':
  mpeg4videodec: move showed_packed_warning from MpegEncContext to Mpeg4DecContext

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

* commit 'f7d22867':
  mpeg4videodec: move intra_dc_threshold from MpegEncContext to Mpeg4DecContext

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

* commit 'a097f004':
  mpeg12dec: move first_slice from MpegEncContext to Mpeg1Context

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

* commit 'ff300e43':
  mpegvideo: remove an unused variable
Merged-by: Michael Niedermayer <michaelni@gmx.at>

* commit 'e41ff421':
  mpeg4videodec: move use_intra_dc_vlc from MpegEncContext to Mpeg4DecContext

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

Originally written by James Almer <jamrial@gmail.com>

With the following contributions by Timothy Gu <timothygu99@gmail.com>

* Use descriptions of libraries from the pkg-config file generation function
* Use "FFmpeg Project" as CompanyName (suggested by Alexander Strasser)
* Use "FFmpeg" for ProductName as MSDN says "name of the product with which the
  file is distributed" [1].
* Use FFmpeg's version (N-xxxxx-gxxxxxxx) for ProductVersion per MSDN [1].
* Only build the .rc files when --enable-small is not enabled.

[1] http://msdn.microsoft.com/en-us/library/windows/desktop/aa381058.aspxSigned-off-by: James Almer <jamrial@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

Fixes ticket #3195.

This reduces the amount of frames that need to be demuxed in av_find_stream_info()
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

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

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

This reduces the number of operations done per non zero coefficient
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

This will allow removing the hacks where each decoder sets
current_picture_ptr on its own.

It is only called from one place in mpegvideo.c now. Also remove the
remove_current parameter, which is always 1.

It is not called from outside of mpegvideo.c anymore.

It is used for encoding only.

It is encoding-only, frame threading is not used for encoding.

* qatar/master:
  x86: Initialize mmxext after amd3dnow optimizations
Merged-by: Michael Niedermayer <michaelni@gmx.at>

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

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