Michael Niedermayer 64160ef392 Merge remote-tracking branch 'qatar/master' ...

* qatar/master:
  cosmetics: remove some stray comments from AVCodec declarations
  cosmetics: fix indentation/alignment in AVCodec declarations
  arm: Avoid using the movw instruction needlessly
  Move an int64_t down in MpegEncContext

Conflicts:
	libavcodec/arm/ac3dsp_armv6.S

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

2011-08-04 01:40:29 +02:00

7.7 KiB

Raw Blame History

View Raw