diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-03-30 21:19:40 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-03-30 21:20:58 +0200 |
| commit | 9c77e57393cc51551d14857729cba22b5372197a (patch) | |
| tree | cc79e752c334789468bc49ec6969a93ee146fc23 | |
| parent | f22d9b1e0b63ef25ba62c06e2ebf55a76614da67 (diff) | |
| parent | 3a5a965493fabfc8151a821092039317834974fe (diff) | |
| download | ffmpeg-9c77e57393cc51551d14857729cba22b5372197a.tar.gz | |
Merge remote-tracking branch 'qatar/master'
* qatar/master:
avconv: make the ASCII flow charts narrower to fit onto TTY
Conflicts:
doc/ffmpeg.texi
See: 8fe107609437909ddd2cf8f5690fe0158a0616f2
Merged-by: Michael Niedermayer <michaelni@gmx.at>
| -rw-r--r-- | doc/ffmpeg.texi | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/doc/ffmpeg.texi b/doc/ffmpeg.texi index c0a81c811a..75f10e3f3b 100644 --- a/doc/ffmpeg.texi +++ b/doc/ffmpeg.texi @@ -90,7 +90,8 @@ the following diagram: | | | decoded | | frames | - ________ ______________ |_________| + |_________| + ________ ______________ | | | | | | | output | <-------- | encoded data | <----+ | file | muxer | packets | encoder |