aboutsummaryrefslogtreecommitdiffstats
path: root/libavcodec/xiph.c
diff options
context:
space:
mode:
authorMichael Niedermayer <michaelni@gmx.at>2013-01-12 13:42:42 +0100
committerMichael Niedermayer <michaelni@gmx.at>2013-01-12 13:42:42 +0100
commitdae382b5b28df492e4bfbac35ac6b0cddc994337 (patch)
treecfc66c3ea9c7a03b53b9e2683fb4f33898e48c28 /libavcodec/xiph.c
parent15daa8f9ddaf678b924ebe997f7b62381c0e2e0a (diff)
parentf89466ad6fd69ea570790e9227e612a751703a37 (diff)
downloadffmpeg-dae382b5b28df492e4bfbac35ac6b0cddc994337.tar.gz
Merge remote-tracking branch 'qatar/master'
* qatar/master: Add version bump and APIchanges entry for Add AV_PIX_FMT_VDPAU. pixfmt: add picture format for VDPAU Conflicts: doc/APIchanges libavutil/pixfmt.h libavutil/version.h Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/xiph.c')
0 files changed, 0 insertions, 0 deletions