[FFmpeg-cvslog] Merge commit '6b45f05ef5b241fd1513702119af9c30056a0ac5'

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Thu Dec 12 19:11:07 2013 +0100| [a435a0337419e7080115a51c283ab0fbbd0ae83f] | committer: Michael Niedermayer

Merge commit '6b45f05ef5b241fd1513702119af9c30056a0ac5'

* commit '6b45f05ef5b241fd1513702119af9c30056a0ac5':
  parseutils: fix discarding const attribute warning

Conflicts:
	libavutil/parseutils.c

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

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