Merge commit 'ffe04c330335add4c6d70ab0bb98e6b3f4f7abfa'
authorMichael Niedermayer <michaelni@gmx.at>
Sun, 17 Nov 2013 11:41:42 +0000 (12:41 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Sun, 17 Nov 2013 11:41:42 +0000 (12:41 +0100)
commitf4f7888bab7061f08c54356c285adaba24383dc0
treecc1b39e0754ac80908cf929f71e5127b83174c48
parenta0c0629dd963b00f989172f0c599353b6b288c37
parentffe04c330335add4c6d70ab0bb98e6b3f4f7abfa
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>
libavcodec/libschroedingerenc.c
libavcodec/libxvid.c
libavcodec/pcxenc.c
libavcodec/roqvideo.h