[FFmpeg-cvslog] Merge commit 'a837c4f2df96a30bf9aa4115b426d608487c7101'

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Sun Nov 17 01:48:57 2013 +0100| [fe3808eddee81ce4712d1e729fa6fe619f1685c8] | committer: Michael Niedermayer

Merge commit 'a837c4f2df96a30bf9aa4115b426d608487c7101'

* commit 'a837c4f2df96a30bf9aa4115b426d608487c7101':
  zmbvenc: use the AVFrame API properly.
  flicvideo: use the AVFrame API properly.
  smacker: use the AVFrame API properly.
  mmvideo: use the AVFrame API properly.

Conflicts:
	libavcodec/flicvideo.c
	libavcodec/mmvideo.c
	libavcodec/smacker.c
	libavcodec/zmbvenc.c

See: 76e27b1d0594199b4b1ff8520312069f42373944
See: 099e57bc38d7e53cf6823dfec349ff9fdaee99ba
Merged-by: Michael Niedermayer <michaelni at gmx.at>

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