Michael Niedermayer d062db7880 Merge commit '21f68c2489cba2a1a4a41d0c5c828266e6162800'
* commit '21f68c2489cba2a1a4a41d0c5c828266e6162800':
  avcodec: bump version after rotation api

Conflicts:
	libavcodec/version.h

Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-05-23 20:48:54 +02:00
..
2014-05-17 04:57:35 +02:00
2014-04-11 17:51:33 +02:00
2014-05-10 00:06:32 +02:00
2013-08-29 22:52:04 +02:00