ffmpeg | branch: master | Michael Niedermayer <michae...@gmx.at> | Sat May  2 
22:39:00 2015 +0200| [f5b26fbc2f564831b337f1de9faaaf6753a03871] | committer: 
Michael Niedermayer

Merge commit '16302246b1fcb7ad4e6f7bd31c49956a455336d2'

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

Conflicts:
        Changelog
        ffmpeg_opt.c

Merged-by: Michael Niedermayer <michae...@gmx.at>

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=f5b26fbc2f564831b337f1de9faaaf6753a03871
---



_______________________________________________
ffmpeg-cvslog mailing list
ffmpeg-cvslog@ffmpeg.org
http://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog

Reply via email to