Michael Niedermayer 8b63eeb6b1 Merge remote-tracking branch 'qatar/master' ...

* qatar/master:
  fate: add test for cropping h264 to container dimensions
  FATE: add a tscc2 test.
  tscc2: allocate AVFrame properly.

Conflicts:
	libavcodec/tscc2.c

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

2013-03-23 12:26:08 +01:00

11 KiB

Raw Blame History

View Raw