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)
commit64160ef39216b2d40eb34c13421febe045ddcf8a
treef5d63c19adb037a18baf2689f503f165b9c39aaf
parent72b0c9f55f26049e22bf147ab120173bd1d54cd5
parentfed6c90b68fa00ad399e0b6d51c1e41d0d3730a0
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>
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