Michael Niedermayer 8d193a24f2 Merge commit '730bac7bab3c7dcd9fcb7c70f154e5f4cfaef9a7' ...

* commit '730bac7bab3c7dcd9fcb7c70f154e5f4cfaef9a7':
  mss4: use the AVFrame API properly.
  mss3: use the AVFrame API properly.
  mss2: use the AVFrame API properly.
  mss1: use the AVFrame API properly.

Conflicts:
	libavcodec/mss1.c
	libavcodec/mss2.c
	libavcodec/mss3.c
	libavcodec/mss4.c

See: 02fe531afe
See: ff1c13b133
See: 310bf28354
Merged-by: Michael Niedermayer <michaelni@gmx.at>

2013-11-17 02:48:17 +01:00

21 KiB

Raw Blame History

View Raw