Merge commit '16302246b1fcb7ad4e6f7bd31c49956a455336d2'
authorMichael Niedermayer <michaelni@gmx.at>
Sat, 2 May 2015 20:39:00 +0000 (22:39 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Sat, 2 May 2015 20:39:00 +0000 (22:39 +0200)
commitf5b26fbc2f564831b337f1de9faaaf6753a03871
treed6983d185fdc2a2df77795a739493c0569872e2c
parentdeedf3e590027e53cf999b11a25fc9be9615b5f2
parent16302246b1fcb7ad4e6f7bd31c49956a455336d2
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 <michaelni@gmx.at>
Changelog
doc/ffmpeg.texi
ffmpeg.c
ffmpeg.h
ffmpeg_filter.c
ffmpeg_opt.c