[FFmpeg-cvslog] Merge commit 'add3a6902ea4d459f36655656a1f8daa409118a7'

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Tue Oct 23 13:13:18 2012 +0200| [c2a25e141e018c6f16b4a2ba3e33f3995bb1a25e] | committer: Michael Niedermayer

Merge commit 'add3a6902ea4d459f36655656a1f8daa409118a7'

* commit 'add3a6902ea4d459f36655656a1f8daa409118a7':
  lavu: bump major to 52

Conflicts:
	libavutil/version.h

Merged-by: Michael Niedermayer <michaelni at gmx.at>

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=c2a25e141e018c6f16b4a2ba3e33f3995bb1a25e
---