OSDN Git Service

(root) / android-x86 / external-ffmpeg.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 934e489 70cbf33)
Merge commit '70cbf33405f50dfaf77e85f382a188acf17dc71a'
authorMichael Niedermayer <michaelni@gmx.at>
Tue, 5 Nov 2013 09:32:10 +0000 (10:32 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Tue, 5 Nov 2013 10:14:29 +0000 (11:14 +0100)
commite1459f4b0bb2482c40b458183f78feadb8fe417b
tree7ad4420ff057438e5c754bb13a0cc2d0fb9fd39btree | snapshot
parent934e489ee8f48cfe8ba18c57a9708b830b613c4dcommit | diff
parent70cbf33405f50dfaf77e85f382a188acf17dc71acommit | diff
Merge commit '70cbf33405f50dfaf77e85f382a188acf17dc71a'

* commit '70cbf33405f50dfaf77e85f382a188acf17dc71a':
  vdpau: Add missing #includes to fix standalone header compilation

Conflicts:
libavcodec/vdpau_internal.h

Not completely merged as this would break use of vdpau.h from C++

Merged-by: Michael Niedermayer <michaelni@gmx.at>
libavcodec/vdpau_internal.h diff1 | diff2 | blob | history
external/ffmpeg
About OSDN
Find Software
Develop Software
Help