eessppeelllloo/ffmpeg
1
0
Fork 0
mirror of https://git.ffmpeg.org/ffmpeg.git synced 2025-12-17 12:30:11 +01:00
Code Issues Packages Projects Releases Wiki Activity
Files
0ebcf878032fa32a02e406a3397b51dc8b45109d
ffmpeg/libavcodec/pnmenc.c
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
Reference in New Issue View Git Blame Copy Permalink