ffmpeg | branch: master | Michael Niedermayer <[email protected]> | Sat Feb 14
22:51:27 2015 +0100| [e33b084ee98664d8f467ea16cdf75643d167b089] | committer:
Michael Niedermayer
Merge commit 'ecbcebde344c9eaeb8877ba2c5d32eb3af621e7f'
* commit 'ecbcebde344c9eaeb8877ba2c5d32eb3af621e7f':
vdpau: Adjust necessary #includes for vdpau_internal.h
Conflicts:
libavcodec/vdpau_internal.h
Merged-by: Michael Niedermayer <[email protected]>
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=e33b084ee98664d8f467ea16cdf75643d167b089
---
_______________________________________________
ffmpeg-cvslog mailing list
[email protected]
http://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog
