mpegvideo: directly use frames in ff_draw_horiz_band()
h264: directly use frames in ff_h264_draw_horiz_band()
er: move relevant fields from Picture to ERPicture

This is done to disentangle ER from mpegvideo. In order to use a
classic Picture, callers can use ff_mpeg_set_erpic() or use a custom function
to set the fields. Please note that buffers need to be allocated before
calling ff_er_frame_end().
h264: move relevant fields from Picture to H264Picture
h264: Replace mpegvideo-specific MAX_PICTURE_COUNT by private define
h264: Replace mpegvideo-specific MAX_THREADS by private define
swscale/x86/swscale: remove unused constants

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Fixed 64bit conformance with mvzbl.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Add missing external declarations.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
avcodec/h264: be more tolerant on what pixel format changes trigger reinits

Fixes Ticket3260

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
avcodec/x86/idct_sse2_xvid: move offsets out of MANGLE()

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Merge commit '75af13a'

* commit '75af13a':
  mpegvideo: directly use frames in ff_draw_horiz_band()

Conflicts:
	libavcodec/mpegvideo.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
Merge commit '1c79b1625d4d257bfd01eccb84cc0ab355fb9a9e'

* commit '1c79b1625d4d257bfd01eccb84cc0ab355fb9a9e':
  h264: directly use frames in ff_h264_draw_horiz_band()

Merged-by: Michael Niedermayer <michaelni@gmx.at>
Merge commit 'd66e305bd1b4f3e91ae4e7e549148509d0811672'

* commit 'd66e305bd1b4f3e91ae4e7e549148509d0811672':
  er: move relevant fields from Picture to ERPicture

Conflicts:
	libavcodec/error_resilience.c
	libavcodec/h264.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
avcodec/mpegvideo: ff_mpeg_set_erpic() clear destination

Fixes crash

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
avcodec/error_resilience: fix the case when MVs are not available

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Merge commit '9b749c8274f6b6f35dde2cf29b99fa4f719abf87'

* commit '9b749c8274f6b6f35dde2cf29b99fa4f719abf87':
  h264: move relevant fields from Picture to H264Picture

Conflicts:
	libavcodec/h264.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
avcodec/h264: h264_set_erpic() clear destination

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Merge commit '5d1c2e53ab3ce27b48c138d22bb01ff8e8304f27'

* commit '5d1c2e53ab3ce27b48c138d22bb01ff8e8304f27':
  h264: Replace mpegvideo-specific MAX_PICTURE_COUNT by private define

Conflicts:
	libavcodec/h264.c
	libavcodec/h264_ps.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
Merge commit 'e3c2d0f3d41f79f7be7ba944aaca2e287c7d5c7c'

* commit 'e3c2d0f3d41f79f7be7ba944aaca2e287c7d5c7c':
  h264: Replace mpegvideo-specific MAX_THREADS by private define

Conflicts:
	libavcodec/h264.h

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