Skip to content
Snippets Groups Projects
Commit deedf3e5 authored by Michael Niedermayer's avatar Michael Niedermayer
Browse files

Merge commit 'e2d50fc2' 


* commit 'e2d50fc2':
  avplay: Add support for rotated video

Conflicts:
	configure
	doc/ffplay.texi
	ffplay.c

See: 08c51e12
Merged-by: default avatarMichael Niedermayer <michaelni@gmx.at>
parents e874772f e2d50fc2
No related branches found
No related tags found
No related merge requests found
Hide whitespace changes
Inline Side-by-side
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment