Michael Niedermayer f4f7888bab 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@gmx.at>

2013-11-17 12:41:42 +01:00

7.1 KiB

Raw Blame History

View Raw