* commit '7ae9791b641d1183910b6e7faca23f7ae08f8579': avformat: bump version after mime_type change Conflicts: libavformat/version.h Merged-by: Michael Niedermayer <michaelni@gmx.at>