Merge remote-tracking branch 'qatar/master'
authorMichael Niedermayer <michaelni@gmx.at>
Wed, 3 Aug 2011 23:40:29 +0000 (01:40 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Wed, 3 Aug 2011 23:40:29 +0000 (01:40 +0200)
* 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>
1  2 
libavcodec/8bps.c
libavcodec/arm/asm-offsets.h
libavcodec/cljr.c
libavcodec/mpegvideo.h
libavcodec/tscc.c
libavcodec/vcr1.c
libavcodec/xsubdec.c
libavcodec/xsubenc.c

Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge