Merge commit 'd8b31be6caebd8d1321ecb754b6e7daaf81dc111'
authorMichael Niedermayer <michaelni@gmx.at>
Tue, 12 Mar 2013 14:29:20 +0000 (15:29 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Tue, 12 Mar 2013 14:35:39 +0000 (15:35 +0100)
commita75f01d7e0bf166a0b443eb15621753619bb8d88
tree64b70ee469a4e74f63e5d4b13efddcc58bbea350
parentc292e340ed0835b112309629e06765c319c5eb42
parentd8b31be6caebd8d1321ecb754b6e7daaf81dc111
Merge commit 'd8b31be6caebd8d1321ecb754b6e7daaf81dc111'

* commit 'd8b31be6caebd8d1321ecb754b6e7daaf81dc111':
  Add the bumps and APIchanges entries for reference counted buffers changes.

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

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