[FFmpeg-cvslog] Merge commit '4cfbeef31d4e6096c0596359d212f5d99a7ba4b5'

Michael Niedermayer git at videolan.org
Sat Dec 27 12:27:31 CET 2014


ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Sat Dec 27 12:15:34 2014 +0100| [57089084ba7ece20889b8196f68ad9b08e8db8ba] | committer: Michael Niedermayer

Merge commit '4cfbeef31d4e6096c0596359d212f5d99a7ba4b5'

* commit '4cfbeef31d4e6096c0596359d212f5d99a7ba4b5':
  h264: factor hwaccel pixel formats list

Conflicts:
	libavcodec/h264_slice.c

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

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





More information about the ffmpeg-cvslog mailing list