aboutsummaryrefslogtreecommitdiffstats
path: root/libavresample
diff options
context:
space:
mode:
authorMichael Niedermayer <michaelni@gmx.at>2013-12-29 03:00:38 +0100
committerMichael Niedermayer <michaelni@gmx.at>2013-12-29 03:16:09 +0100
commit3477874abdd4a892ec3df2a9685ed959e2f73f21 (patch)
tree87eb3af9a69797d59cd666ad1841e97ce608ae31 /libavresample
parent54bb30bae2ec6d721dd4dd89fff762b14fcf68e4 (diff)
parent344d6db978af251e32b886f4c54e993771004fc0 (diff)
downloadffmpeg-3477874abdd4a892ec3df2a9685ed959e2f73f21.tar.gz
Merge branch 'master' of https://github.com/upsuper/ffmpeg-vdadec
* 'master' of https://github.com/upsuper/ffmpeg-vdadec: avcodec/vda_h264_dec: add format check Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavresample')
0 files changed, 0 insertions, 0 deletions