Merge remote-tracking branch 'qatar/master'
authorMichael Niedermayer <michaelni@gmx.at>
Sat, 9 Jun 2012 18:30:17 +0000 (20:30 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Sat, 9 Jun 2012 18:30:17 +0000 (20:30 +0200)
commit75f8f702217fdeae9e2868c7ba80c03f9ec0958a
treef18ccb504b4ea2d45407fc35a9cb8f8efb869bb6
parent8554e21f79a88844c7b192b029c9f6257f8b66f1
parent30f515091c323da59c0f1b533703dedca2f4b95d
Merge remote-tracking branch 'qatar/master'

* qatar/master:
  h264: allow cropping to AVCodecContext.width/height
  mov: set AVCodecContext.width/height for h264
  iac: generate codec tables as they are supposed to be
  indeo4: handle frame type 1 properly
  lavu: change versioning script to include all av* prefixed symbols

Conflicts:
libavcodec/h264.c
libavutil/libavutil.v

Merged-by: Michael Niedermayer <michaelni@gmx.at>
libavcodec/h264.c
libavcodec/imc.c
libavcodec/imcdata.h
libavcodec/indeo4.c
libavformat/mov.c