[FFmpeg-cvslog] Merge commit 'ffe04c330335add4c6d70ab0bb98e6b3f4f7abfa'

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Sun Nov 17 12:41:42 2013 +0100| [f4f7888bab7061f08c54356c285adaba24383dc0] | committer: Michael Niedermayer

Merge commit 'ffe04c330335add4c6d70ab0bb98e6b3f4f7abfa'

* commit 'ffe04c330335add4c6d70ab0bb98e6b3f4f7abfa':
  libxvid: use the AVFrame API properly.
  pcxenc: use the AVFrame API properly.
  roqvideo: remove unused variables
  libschroedingerenc: use the AVFrame API properly.

Conflicts:
	libavcodec/pcxenc.c

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

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