Michael Niedermayer 8cc5481d51 Merge remote-tracking branch 'qatar/master' ...

* qatar/master:
  lavc: Deprecate the deinterlace functions in libavcodec
  h264: Integrate draw_horiz_band into ff_h264_draw_horiz_band

Conflicts:
	configure
	ffmpeg_opt.c
	libavcodec/avcodec.h
	libavcodec/h264.c
	libavcodec/imgconvert.c
	libavcodec/version.h

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

2013-03-07 11:50:17 +01:00

117 KiB

Raw Blame History

View Raw