[FFmpeg-cvslog] Merge commit '7ae9791b641d1183910b6e7faca23f7ae08f8579'

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Wed Oct  8 21:45:41 2014 +0200| [9da679e77fa25487ae37db11f010fde68034e362] | committer: Michael Niedermayer

Merge commit '7ae9791b641d1183910b6e7faca23f7ae08f8579'

* commit '7ae9791b641d1183910b6e7faca23f7ae08f8579':
  avformat: bump version after mime_type change

Conflicts:
	libavformat/version.h

Merged-by: Michael Niedermayer <michaelni at gmx.at>

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