breeze/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2026-02-04 14:30:55 +08:00
Code Issues Packages Projects Releases Wiki Activity
Files
a94de50ba02f5c260ca7c571b43fb595c8f951b6
FFmpeg/libavcodec/pamenc.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

4.4 KiB
Raw Blame History

View Raw
Reference in New Issue View Git Blame Copy Permalink