Merge commit '1985c2e75c607ac51bfd8dc87d2957a5edf2b6f8'
authorMichael Niedermayer <michaelni@gmx.at>
Sat, 9 Aug 2014 22:26:45 +0000 (00:26 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Sat, 9 Aug 2014 22:26:45 +0000 (00:26 +0200)
commita57ece0cb48ba131a2d6ba9d4525d9195238f18c
treef8cf30fc37742977986cef12f616ebd15869c9d0
parent80c1cb522c9779c3e799fbe2fc5e19a53bfd079f
parent1985c2e75c607ac51bfd8dc87d2957a5edf2b6f8
Merge commit '1985c2e75c607ac51bfd8dc87d2957a5edf2b6f8'

* commit '1985c2e75c607ac51bfd8dc87d2957a5edf2b6f8':
  Bump major versions of all libraries.

Conflicts:
doc/APIchanges
libavcodec/version.h
libavdevice/version.h
libavfilter/version.h
libavformat/version.h
libavutil/version.h
libswscale/version.h

Merged-by: Michael Niedermayer <michaelni@gmx.at>
doc/APIchanges
libavcodec/version.h
libavdevice/version.h
libavfilter/version.h
libavformat/version.h
libavresample/version.h
libavutil/version.h
libswscale/version.h