Merge commit 'f4c444e17d137c786f0ed2da0e5943df505d5f9e'
authorMichael Niedermayer <michaelni@gmx.at>
Sat, 9 Aug 2014 20:19:18 +0000 (22:19 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Sat, 9 Aug 2014 20:19:45 +0000 (22:19 +0200)
commit3e41d2e612215e2ee9f436e3ad3bd8440b6ddfb4
tree4f0c33c423c6ef6929256e946b5bfd23cf251a11
parent499ff6a052591d980ed36e10ac2019cef14c302b
parentf4c444e17d137c786f0ed2da0e5943df505d5f9e
Merge commit 'f4c444e17d137c786f0ed2da0e5943df505d5f9e'

* commit 'f4c444e17d137c786f0ed2da0e5943df505d5f9e':
  Postpone API-incompatible changes until the next bump.

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