aboutsummaryrefslogtreecommitdiffstats
path: root/libavformat/movenc.h
diff options
context:
space:
mode:
authorMichael Niedermayer <michaelni@gmx.at>2014-03-12 02:39:46 +0100
committerMichael Niedermayer <michaelni@gmx.at>2014-03-12 02:39:46 +0100
commitb752d02f42bbefdf8b198f03f166cc98bffcc8e8 (patch)
treedcf50766b1716539dd87460204811ab4609ae2e1 /libavformat/movenc.h
parent03fd80dcb1f8885385bcd04aa59a2931db5316d3 (diff)
parent78b21c1d7177e1d61ad3c9225f67699da089aa7c (diff)
downloadffmpeg-b752d02f42bbefdf8b198f03f166cc98bffcc8e8.tar.gz
Merge commit '78b21c1d7177e1d61ad3c9225f67699da089aa7c'
* commit '78b21c1d7177e1d61ad3c9225f67699da089aa7c': http: Drop doxy comments Conflicts: libavformat/http.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavformat/movenc.h')
0 files changed, 0 insertions, 0 deletions