Michael Niedermayer 37945584bf 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>

2013-12-09 12:54:59 +01:00

6.0 KiB

Raw Blame History

View Raw