aboutsummaryrefslogtreecommitdiffstats
path: root/doc/general.texi
diff options
context:
space:
mode:
authorMichael Niedermayer <michaelni@gmx.at>2014-10-15 12:30:07 +0200
committerMichael Niedermayer <michaelni@gmx.at>2014-10-15 12:30:07 +0200
commit51c810e62b63a1451b337b1cba0141b386066668 (patch)
tree1b5d4697495201e68400608a0bb9fc1ba738ebb8 /doc/general.texi
parentfd937866f7b7ae3303e8a78b1e9a48d853360d62 (diff)
parentd565fef1b83b6c5f8afb32229260b79f67c68109 (diff)
downloadffmpeg-51c810e62b63a1451b337b1cba0141b386066668.tar.gz
Merge commit 'd565fef1b83b6c5f8afb32229260b79f67c68109'
* commit 'd565fef1b83b6c5f8afb32229260b79f67c68109': vdpau: add AV_HWACCEL_FLAG_IGNORE_LEVEL to skip the codec level check Conflicts: libavcodec/version.h Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'doc/general.texi')
0 files changed, 0 insertions, 0 deletions