Signed-off-by: Paul B Mahol <onemda@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
(cherry picked from commit a4209ad631)
Conflicts:
Changelog
doc/general.texi
libavformat/version.h
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
