* commit 'afa21a12':
  p*menc: use the AVFrame API properly.

Conflicts:
	libavcodec/Makefile
	libavcodec/pamenc.c
	libavcodec/pnmenc.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>