Michael Niedermayer 6c17ff84ad 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@gmx.at>

2013-03-08 14:57:41 +01:00

9.9 KiB

Raw Blame History

View Raw