[FFmpeg-cvslog] Merge commit '9a60b1fad02cb783b895b2145c3dafc01f7b337c'

Michael Niedermayer git at videolan.org
Mon Mar 16 00:18:00 CET 2015


ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Mon Mar 16 00:14:30 2015 +0100| [3e486162267f1de4447dc6e6bd45ac666647ba7e] | committer: Michael Niedermayer

Merge commit '9a60b1fad02cb783b895b2145c3dafc01f7b337c'

* commit '9a60b1fad02cb783b895b2145c3dafc01f7b337c':
  libswscale: fix compiler warnings enumerated type mixed with another type

Conflicts:
	libswscale/swscale_unscaled.c

Merged-by: Michael Niedermayer <michaelni at gmx.at>

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=3e486162267f1de4447dc6e6bd45ac666647ba7e
---





More information about the ffmpeg-cvslog mailing list