aboutsummaryrefslogtreecommitdiffstats
path: root/libavcodec/truespeech_data.h
diff options
context:
space:
mode:
authorHendrik Leppkes <h.leppkes@gmail.com>2015-09-16 11:20:42 +0200
committerHendrik Leppkes <h.leppkes@gmail.com>2015-09-16 11:20:42 +0200
commit643a1560024f52ba56b56e812820765b3ae03be6 (patch)
tree338b26ebfb55b128bfe6ba7a051ba482bae8d45c /libavcodec/truespeech_data.h
parentc2972a2800242229ac22e882fe60245a44ac026c (diff)
parent285fe5b098c8fbefaed4aacdb839b760a5b7f20d (diff)
downloadffmpeg-643a1560024f52ba56b56e812820765b3ae03be6.tar.gz
Merge commit '285fe5b098c8fbefaed4aacdb839b760a5b7f20d'
* commit '285fe5b098c8fbefaed4aacdb839b760a5b7f20d': avfilter: Support both syntaxes for the scale filter Not merged, ffmpeg has much more flexible option handling Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
Diffstat (limited to 'libavcodec/truespeech_data.h')
0 files changed, 0 insertions, 0 deletions