Merge remote-tracking branch 'qatar/master'

* qatar/master: avconv: make the ASCII flow charts narrower to fit onto TTY Conflicts: doc/ffmpeg.texi See: 8fe1076094 Merged-by: Michael Niedermayer <michaelni@gmx.at>
11 years ago · 9c77e57393
parent f22d9b1e0b 3a5a965493
commit 9c77e57393
1 changed files with 2 additions and 1 deletions
--- a/doc/ffmpeg.texi
+++ b/doc/ffmpeg.texi
@ -90,7 +90,8 @@ the following diagram:
                                      |         |
                                      | decoded |
                                      | frames  |
- ________             ______________  |_________|
+                                      |_________|
+ ________             ______________       |
 |        |           |              |      |
 | output | <-------- | encoded data | <----+
 | file   |   muxer   | packets      |   encoder