[FFmpeg-cvslog] Merge commit '172b2cee17a3779c114ba065dd7b25dcf61e408f'

Michael Niedermayer git at videolan.org
Mon Jun 1 23:07:43 CEST 2015


ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Mon Jun  1 22:58:57 2015 +0200| [14617e3a739ea23e8da9adcdca4418f2b14a3956] | committer: Michael Niedermayer

Merge commit '172b2cee17a3779c114ba065dd7b25dcf61e408f'

* commit '172b2cee17a3779c114ba065dd7b25dcf61e408f':
  dxva2: Add ifdefs around structs that might not be available

Conflicts:
	libavcodec/dxva2.c

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

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





More information about the ffmpeg-cvslog mailing list