Merge remote-tracking branch 'qatar/master'
authorMichael Niedermayer <michaelni@gmx.at>
Mon, 24 Dec 2012 15:13:06 +0000 (16:13 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Mon, 24 Dec 2012 15:20:07 +0000 (16:20 +0100)
commit7681b8e9a922b9c1b45d95e2585b716a1caed360
treeabcd015f2c160784cae4ccef96abff2bc3b32601
parent9dbedf331eca9903230368f28716f29e7375450a
parent0a9132b84c0590500bb3d6b358219323805993fc
Merge remote-tracking branch 'qatar/master'

* qatar/master:
  wnv1: cosmetics, reformat
  xan: remove a trivially true if().
  ansi: do not depend on get_buffer() initializing the frame.
  zerocodec: remove an unused variable.
  zmbv: remove some pointless comments and empty lines

Conflicts:
libavcodec/xan.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
libavcodec/ansi.c
libavcodec/wnv1.c
libavcodec/xan.c
libavcodec/zmbv.c