[FFmpeg-cvslog] Merge commit '7798a59dc14ae27efe64e639a42646002608a908'

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Sun Jun 30 13:42:41 2013 +0200| [06549cee42819c2bef58bd123cd0ac9d916244f2] | committer: Michael Niedermayer

Merge commit '7798a59dc14ae27efe64e639a42646002608a908'

* commit '7798a59dc14ae27efe64e639a42646002608a908':
  avconv: Don't include colorspace.h

No change as the commit is already part of ffmpeg.

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

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