[FFmpeg-cvslog] Merge commit '565e4993c63f797e2d50ad2f1e8f62fdbe299666'

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Thu Nov 29 02:37:46 2012 +0100| [87b9dc098240e72c8874e2d3a75e954cd56dc776] | committer: Michael Niedermayer

Merge commit '565e4993c63f797e2d50ad2f1e8f62fdbe299666'

The commit has already been split and commited, this merge is just for metadata.
What has not been merged is the removial of some start/end_frame / draw_slice
related functions that are still in use. They can be removed once they are
unused.

* commit '565e4993c63f797e2d50ad2f1e8f62fdbe299666':
  lavfi: merge start_frame/draw_slice/end_frame

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

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