]> git.sesse.net Git - ffmpeg/commitdiff
projects / ffmpeg / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: d08bb06 eeaf4f3)
Merge commit 'eeaf4f3b87815cbae4c12856cfaafb3a2dae8e0c'
authorMichael Niedermayer <michaelni@gmx.at>
Wed, 5 Mar 2014 10:48:39 +0000 (11:48 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Wed, 5 Mar 2014 10:49:27 +0000 (11:49 +0100)
* commit 'eeaf4f3b87815cbae4c12856cfaafb3a2dae8e0c':
  av_vdpau_get_profile: mask out H.264 intra profile flag

Merged-by: Michael Niedermayer <michaelni@gmx.at>
1  2 
libavcodec/vdpau.c patch | diff1 | diff2 | blob | history

diff --cc libavcodec/vdpau.c
Simple merge
Unnamed repository; edit this file 'description' to name the repository.