aboutsummaryrefslogtreecommitdiffstats
path: root/libavformat/latmenc.c
diff options
context:
space:
mode:
authorMichael Niedermayer <michaelni@gmx.at>2014-11-17 12:43:55 +0100
committerMichael Niedermayer <michaelni@gmx.at>2014-11-17 12:43:55 +0100
commitbb7be3b763d37c1e869431a76da7a8a2ddf1d9f9 (patch)
tree572112bf0e75ba083b8a777c379b74abfb25b031 /libavformat/latmenc.c
parentc88ae843da4a9589a6ef1138fb9d9aaa28add2d3 (diff)
parent4d0cd5f58c892276716f46f4b2702915e5018215 (diff)
downloadffmpeg-bb7be3b763d37c1e869431a76da7a8a2ddf1d9f9.tar.gz
Merge commit '4d0cd5f58c892276716f46f4b2702915e5018215'
* commit '4d0cd5f58c892276716f46f4b2702915e5018215': flvenc: move metadata updates into a single function Conflicts: libavformat/flvenc.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavformat/latmenc.c')
0 files changed, 0 insertions, 0 deletions