ffmpeg | branch: master | Michael Niedermayer <[email protected]> | Sat Dec 27
13:37:39 2014 +0100| [6f764d291121f4980b292cdaa537aa8fb10cb93b] | committer:
Michael Niedermayer
Merge commit '737d35e33408263c04d7730f5487eed0d04938ba'
* commit '737d35e33408263c04d7730f5487eed0d04938ba':
vdpau: add support for the H.264 High 4:4:4 Predictive profile
Conflicts:
libavcodec/vdpau_internal.h
Merged-by: Michael Niedermayer <[email protected]>
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=6f764d291121f4980b292cdaa537aa8fb10cb93b
---
_______________________________________________
ffmpeg-cvslog mailing list
[email protected]
http://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog
