Merge commit 'afa21a12bf084f905187615706b0a8d92bc98661'
authorMichael Niedermayer <michaelni@gmx.at>
Mon, 9 Dec 2013 11:54:59 +0000 (12:54 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Mon, 9 Dec 2013 11:54:59 +0000 (12:54 +0100)
commit37945584bfb29f187e38531c90bb02a32014e48d
treeae79af85bc44ef636313252c7f43f967488b459c
parent639303867640d1880fad675472bc47e9c95f96c7
parentafa21a12bf084f905187615706b0a8d92bc98661
Merge commit 'afa21a12bf084f905187615706b0a8d92bc98661'

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

Conflicts:
libavcodec/Makefile
libavcodec/pamenc.c
libavcodec/pnmenc.c

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