[FFmpeg-cvslog] Merge commit '730bac7bab3c7dcd9fcb7c70f154e5f4cfaef9a7'

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Sun Nov 17 02:43:57 2013 +0100| [8d193a24f2da825aaf5382e4aa42ab533806b033] | committer: Michael Niedermayer

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: 02fe531afefa7ac3fcc552f8e83461a4bfa7f868
See: ff1c13b133d548b3ce103f91999b6cc1bb7e65cc
See: 310bf283542ff81a9ec8fa7492fe7d625e80562f
Merged-by: Michael Niedermayer <michaelni at gmx.at>

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=8d193a24f2da825aaf5382e4aa42ab533806b033
---