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

Merge commit '16302246' 


* commit '16302246':
  avconv: Add an option for automatically rotating video according to display matrix

Conflicts:
	Changelog
	ffmpeg_opt.c

Merged-by: default avatarMichael Niedermayer <michaelni@gmx.at>
parents deedf3e5 16302246
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