aboutsummaryrefslogtreecommitdiffstats
path: root/libavformat/mux.c
diff options
context:
space:
mode:
authorMichael Niedermayer <michaelni@gmx.at>2013-09-17 11:43:58 +0200
committerMichael Niedermayer <michaelni@gmx.at>2013-09-17 11:44:02 +0200
commit22f79a2d605f3c3b36bb05e9609ff3a3dc27d1f9 (patch)
treedf8816f0e4209a77e6c366037257448375737d61 /libavformat/mux.c
parenta275ff7e010a7fd5899014353996ef3154f3341d (diff)
parent0a9425d7cfdf0113c3d32096c9406823efe0cd0a (diff)
downloadffmpeg-22f79a2d605f3c3b36bb05e9609ff3a3dc27d1f9.tar.gz
Merge commit '0a9425d7cfdf0113c3d32096c9406823efe0cd0a'
* commit '0a9425d7cfdf0113c3d32096c9406823efe0cd0a': flv: Do not export datastream as metadata Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavformat/mux.c')
0 files changed, 0 insertions, 0 deletions