diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-02-19 22:09:10 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-02-19 22:09:10 +0100 |
| commit | 4ba03e37fd169ca444bc7c5ca330363584afff1e (patch) | |
| tree | 13ee0988e99f10e519e0493d09cd0643e59633d3 | |
| parent | ca5b45b9b3cb488e6b7d76a7db8befff98acf640 (diff) | |
| parent | 93632a70f9ac2cb2ebf0e69d21fdfaae68ff02fd (diff) | |
| download | ffmpeg-4ba03e37fd169ca444bc7c5ca330363584afff1e.tar.gz | |
Merge commit '93632a70f9ac2cb2ebf0e69d21fdfaae68ff02fd'
* commit '93632a70f9ac2cb2ebf0e69d21fdfaae68ff02fd':
doc: Name the MOV muxer as it should be called
Conflicts:
doc/muxers.texi
Merged-by: Michael Niedermayer <michaelni@gmx.at>
| -rw-r--r-- | doc/muxers.texi | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/doc/muxers.texi b/doc/muxers.texi index 4d88b1c340..0ecc04c206 100644 --- a/doc/muxers.texi +++ b/doc/muxers.texi @@ -473,7 +473,7 @@ ffmpeg -i INPUT -f md5 - See also the @ref{framemd5} muxer. -@section mov/mp4/ismv +@section mov, mp4, ismv MOV/MP4/ISMV (Smooth Streaming) muxer. |