Merge commit '21f68c2489cba2a1a4a41d0c5c828266e6162800'
authorMichael Niedermayer <michaelni@gmx.at>
Fri, 23 May 2014 18:48:54 +0000 (20:48 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Fri, 23 May 2014 18:48:54 +0000 (20:48 +0200)
commitd062db788012b94e899008964b93cf01a8389fec
tree1cf04c15dfd9eea127b543bd12bae021a5e789cd
parent4e4dbb99831d97d0716a3ec048278ddd75205b5a
parent21f68c2489cba2a1a4a41d0c5c828266e6162800
Merge commit '21f68c2489cba2a1a4a41d0c5c828266e6162800'

* commit '21f68c2489cba2a1a4a41d0c5c828266e6162800':
  avcodec: bump version after rotation api

Conflicts:
libavcodec/version.h

Merged-by: Michael Niedermayer <michaelni@gmx.at>
doc/APIchanges
libavcodec/version.h