Merge remote-tracking branch 'qatar/master'
authorMichael Niedermayer <michaelni@gmx.at>
Thu, 7 Mar 2013 10:50:17 +0000 (11:50 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Thu, 7 Mar 2013 10:50:17 +0000 (11:50 +0100)
commit8cc5481d51bf746d9d43348af711dbf201bf336a
tree0a4102445621aecf2e34d8a6ee853e97d73525eb
parent47f1af47b6cb763452c5bab3704ca965fccad25b
parent54b298fe5650c124c29a8283cfd05024ac409d3a
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>
ffmpeg.c
libavcodec/avcodec.h
libavcodec/h264.c
libavcodec/version.h