FFmpeg/libavcodec
Michael Niedermayer 7681b8e9a9 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>
2012-12-24 16:20:07 +01:00
..
2012-12-22 00:58:08 +01:00
2012-12-22 00:58:08 +01:00
2012-12-21 00:18:34 +01:00
2012-12-24 04:35:12 +01:00
2012-12-21 00:18:34 +01:00
2012-12-21 00:18:34 +01:00
2012-12-21 00:18:34 +01:00
2012-12-21 00:18:34 +01:00
2012-12-22 00:58:08 +01:00
2012-12-22 00:58:08 +01:00
2012-12-22 00:58:08 +01:00
2012-12-21 00:18:34 +01:00