aboutsummaryrefslogtreecommitdiffstats
path: root/libavformat/mux.c
diff options
context:
space:
mode:
authorMichael Niedermayer <michaelni@gmx.at>2014-11-08 10:57:10 +0100
committerMichael Niedermayer <michaelni@gmx.at>2014-11-08 10:57:10 +0100
commit0bdc5db520ba9126776dd12b6734150ebcc7c559 (patch)
tree006c75694466587e9fb5fc48486f3ac26339875b /libavformat/mux.c
parent2b14593148e0aef6f3ca76dcc3f9f2133a066b3d (diff)
parent95a449d3ce8e15522df47a80a8a4593ea5c2b1bb (diff)
downloadffmpeg-0bdc5db520ba9126776dd12b6734150ebcc7c559.tar.gz
Merge commit '95a449d3ce8e15522df47a80a8a4593ea5c2b1bb'
* commit '95a449d3ce8e15522df47a80a8a4593ea5c2b1bb': movenc: Remove an outdated comment Conflicts: libavformat/movenc.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavformat/mux.c')
0 files changed, 0 insertions, 0 deletions