-
Michael Niedermayer authored
Signed-off-by:
Michael Niedermayer <michael@niedermayer.cc> (cherry picked from commit 26811fd9) Conflicts: libavformat/version.h
6e5648ad
Signed-off-by:Michael Niedermayer <michael@niedermayer.cc> (cherry picked from commit 26811fd9) Conflicts: libavformat/version.h