aboutsummaryrefslogtreecommitdiffstats
path: root/libswresample/Makefile
diff options
context:
space:
mode:
authorMichael Niedermayer <michaelni@gmx.at>2015-03-12 21:38:47 +0100
committerMichael Niedermayer <michaelni@gmx.at>2015-03-12 21:41:55 +0100
commita91c175db20834d6474b104619505bcb537bf3f9 (patch)
tree0ad814709cffa98fed8627f565755423f0a1a554 /libswresample/Makefile
parent9ecfe0b87834576ce69401067fe1130a723eb2d4 (diff)
parent17c45d4d056d0e10ecb88b424ec9e68be398da5e (diff)
downloadffmpeg-a91c175db20834d6474b104619505bcb537bf3f9.tar.gz
Merge commit '17c45d4d056d0e10ecb88b424ec9e68be398da5e'
* commit '17c45d4d056d0e10ecb88b424ec9e68be398da5e': libtheora: Check frame allocation Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libswresample/Makefile')
0 files changed, 0 insertions, 0 deletions