[FFmpeg-cvslog] Merge commit 'ed4b757177f9b563412cdbc8ee3405d82e10fc05'

Michael Niedermayer git at videolan.org
Tue Apr 29 01:03:56 CEST 2014


ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Tue Apr 29 00:48:25 2014 +0200| [0f630b7b1244e7fab3dc66c3fb396186f7c09065] | committer: Michael Niedermayer

Merge commit 'ed4b757177f9b563412cdbc8ee3405d82e10fc05'

* commit 'ed4b757177f9b563412cdbc8ee3405d82e10fc05':
  dxva2_h264: add a workaround for old Intel GPUs

Conflicts:
	doc/APIchanges
	libavcodec/version.h

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

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





More information about the ffmpeg-cvslog mailing list