[FFmpeg-cvslog] Merge commit '998fdcff41bbda8ef13c991743376556f910efa9'

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Thu Dec 13 11:53:09 2012 +0100| [9c0ec23c7dde8a2d6a356fa21cf3339b208467cf] | committer: Michael Niedermayer

Merge commit '998fdcff41bbda8ef13c991743376556f910efa9'

* commit '998fdcff41bbda8ef13c991743376556f910efa9':
  lavc: replace some forgotten instances of PixelFormat with AVPixelFormat
  svq1: unmacroify macros used only once.

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

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