summaryrefslogtreecommitdiff
path: root/doc/ffmpeg.texi
diff options
context:
space:
mode:
authorMichael Niedermayer <michaelni@gmx.at>2015-05-02 22:21:28 +0200
committerMichael Niedermayer <michaelni@gmx.at>2015-05-02 22:31:20 +0200
commitdeedf3e590027e53cf999b11a25fc9be9615b5f2 (patch)
treea08c124244e22d1a0e416fbfcaaaff7e2238f469 /doc/ffmpeg.texi
parente874772f70908ad5b1754c0373a35bec08fad547 (diff)
parente2d50fc2f5f3600e13055acf1a10fec35e941f37 (diff)
Merge commit 'e2d50fc2f5f3600e13055acf1a10fec35e941f37'
* commit 'e2d50fc2f5f3600e13055acf1a10fec35e941f37': avplay: Add support for rotated video Conflicts: configure doc/ffplay.texi ffplay.c See: 08c51e12b1c3f3e3e68e33eb46be7131df5b3682 Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'doc/ffmpeg.texi')
0 files changed, 0 insertions, 0 deletions