eessppeelllloo/ffmpeg
1
0
Fork 0
mirror of https://git.ffmpeg.org/ffmpeg.git synced 2025-12-22 23:10:00 +01:00
Code Issues Packages Projects Releases Wiki Activity
Files
0ebcf878032fa32a02e406a3397b51dc8b45109d
ffmpeg/libavcodec/gif.c
Michael Niedermayer 5b0c70c249 Merge commit '57e7b3a89f5a0879ad039e8f04273b48649799a8' 
* commit '57e7b3a89f5a0879ad039e8f04273b48649799a8':
  dnxhdenc: use the AVFrame API properly.
  libx264: use the AVFrame API properly.
  svq1enc: use the AVFrame API properly.
  gif: use the AVFrame API properly.

Conflicts:
	libavcodec/gif.c
	libavcodec/svq1enc.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-11-17 12:19:55 +01:00

10 KiB
Raw Blame History

View Raw
Reference in New Issue View Git Blame Copy Permalink