aboutsummaryrefslogtreecommitdiffstats
path: root/libavcodec/aacenc_pred.c
diff options
context:
space:
mode:
authorClément Bœsch <u@pkh.me>2017-03-30 23:22:52 +0200
committerClément Bœsch <u@pkh.me>2017-03-30 23:22:52 +0200
commitaac40dd6154da79fa28ac5a23b40edaec472009a (patch)
treeb3ee5ac8938408d5511234fe658e74e48c187822 /libavcodec/aacenc_pred.c
parent9813df118984b4e5c6c121b180cb664f7cd233bd (diff)
parent943533d64c7fa7a1b2fc9559e67652c349d21d51 (diff)
downloadffmpeg-aac40dd6154da79fa28ac5a23b40edaec472009a.tar.gz
Merge commit '943533d64c7fa7a1b2fc9559e67652c349d21d51'
* commit '943533d64c7fa7a1b2fc9559e67652c349d21d51': avconv: Correct function pointer assignments in options array This commit is a noop, see 4c96985af1b8870482b6b6ef9120960633f62cee Merged-by: Clément Bœsch <u@pkh.me>
Diffstat (limited to 'libavcodec/aacenc_pred.c')
0 files changed, 0 insertions, 0 deletions