[FFmpeg-cvslog] Merge commit 'efa7f4202088c70caba11d7834641bc6eaf41830'

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Fri Mar  8 14:57:41 2013 +0100| [6c17ff84ad8f2be64ddc9bd4955e1cc87842ac29] | committer: Michael Niedermayer

Merge commit 'efa7f4202088c70caba11d7834641bc6eaf41830'

* commit 'efa7f4202088c70caba11d7834641bc6eaf41830':
  Use the avstring.h locale-independent character type functions
  avstring: Add locale independent versions of some ctype.h functions

Conflicts:
	avprobe.c
	doc/APIchanges
	libavcodec/dvdsubdec.c
	libavcodec/utils.c
	libavutil/avstring.c
	libavutil/avstring.h
	libavutil/eval.c
	libavutil/parseutils.c
	libavutil/version.h

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

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