Michael Niedermayer 75f8f70221 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>

2012-06-09 20:30:17 +02:00

9.4 KiB

Raw Blame History

View Raw