Merge commit '998fdcff41bbda8ef13c991743376556f910efa9'
authorMichael Niedermayer <michaelni@gmx.at>
Thu, 13 Dec 2012 10:53:09 +0000 (11:53 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Thu, 13 Dec 2012 10:53:15 +0000 (11:53 +0100)
commit9c0ec23c7dde8a2d6a356fa21cf3339b208467cf
tree0a088938209af2c626087587864be5002479c7dc
parente7f255d89b587ce78b17d1bd45521d21ff10822b
parent998fdcff41bbda8ef13c991743376556f910efa9
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@gmx.at>
libavcodec/asvenc.c
libavcodec/svq1dec.c