aboutsummaryrefslogtreecommitdiffstats
path: root/libswscale/Makefile
diff options
context:
space:
mode:
authorMichael Niedermayer <michaelni@gmx.at>2015-05-06 22:29:07 +0200
committerMichael Niedermayer <michaelni@gmx.at>2015-05-06 22:29:19 +0200
commit0318013afcffe0c3b8a0f0bf9f5f527098f6fa47 (patch)
tree19161b4c6a472b9d332e79a3a517b50af7eadd7b /libswscale/Makefile
parent1caff5731d9a9f98de9e50569bac0d2d487e9e53 (diff)
parent6c8c7c246280cdcd23e4d99006b95245ae837278 (diff)
downloadffmpeg-0318013afcffe0c3b8a0f0bf9f5f527098f6fa47.tar.gz
Merge commit '6c8c7c246280cdcd23e4d99006b95245ae837278'
* commit '6c8c7c246280cdcd23e4d99006b95245ae837278': dump: Print AVAudioServiceType side data Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libswscale/Makefile')
0 files changed, 0 insertions, 0 deletions