[FFmpeg-cvslog] Merge commit '15ba7f6525c0f56f0c8e3e3e0c0c5129de054f41'

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Fri Oct 12 14:38:04 2012 +0200| [d6135a886d85bdbf271c55a238c3336670adc742] | committer: Michael Niedermayer

Merge commit '15ba7f6525c0f56f0c8e3e3e0c0c5129de054f41'

* commit '15ba7f6525c0f56f0c8e3e3e0c0c5129de054f41':
  parseutils: fix const removal warning
  prepare 9_beta1 release

Conflicts:
	Changelog
	RELEASE
	libavutil/parseutils.c

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

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