* commit '998fdcff':
  lavc: replace some forgotten instances of PixelFormat with AVPixelFormat
  svq1: unmacroify macros used only once.
Merged-by: Michael Niedermayer <michaelni@gmx.at>