[FFmpeg-cvslog] Merge remote-tracking branch 'qatar/master'

Michael Niedermayer git at videolan.org
Thu Mar 7 11:57:58 CET 2013


ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Thu Mar  7 11:50:17 2013 +0100| [8cc5481d51bf746d9d43348af711dbf201bf336a] | committer: Michael Niedermayer

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 at gmx.at>

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=8cc5481d51bf746d9d43348af711dbf201bf336a
---





More information about the ffmpeg-cvslog mailing list