]> git.sesse.net Git - ffmpeg/commitdiff
projects / ffmpeg / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: f22d9b1 3a5a965)
Merge remote-tracking branch 'qatar/master'
authorMichael Niedermayer <michaelni@gmx.at>
Sun, 30 Mar 2014 19:19:40 +0000 (21:19 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Sun, 30 Mar 2014 19:20:58 +0000 (21:20 +0200)
* 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>
1  2 
doc/ffmpeg.texi patch | diff1 | diff2 | blob | history

diff --cc doc/ffmpeg.texi
Simple merge
Unnamed repository; edit this file 'description' to name the repository.