aboutsummaryrefslogtreecommitdiffstats
path: root/libavcodec/sipr16k.c
diff options
context:
space:
mode:
authorMichael Niedermayer <michaelni@gmx.at>2014-12-27 13:37:39 +0100
committerMichael Niedermayer <michaelni@gmx.at>2014-12-27 14:46:15 +0100
commit6f764d291121f4980b292cdaa537aa8fb10cb93b (patch)
treed5b576132ba517872c2bad8e8423a96e3d0bef3b /libavcodec/sipr16k.c
parenta6ab9ed50d8a5b749f3e0a670e4fd6ee52d92b94 (diff)
parent737d35e33408263c04d7730f5487eed0d04938ba (diff)
downloadffmpeg-6f764d291121f4980b292cdaa537aa8fb10cb93b.tar.gz
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 <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/sipr16k.c')
0 files changed, 0 insertions, 0 deletions