diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-03-08 14:57:41 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-03-08 14:57:41 +0100 |
| commit | 6c17ff84ad8f2be64ddc9bd4955e1cc87842ac29 (patch) | |
| tree | 48f9a7c9169dc29106f18a4ed13010e255d52bcb /libavcodec | |
| parent | 80f91a70be5f03fc95eb89d222d760eeaf91b135 (diff) | |
| parent | efa7f4202088c70caba11d7834641bc6eaf41830 (diff) | |
| download | ffmpeg-6c17ff84ad8f2be64ddc9bd4955e1cc87842ac29.tar.gz | |
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>
Diffstat (limited to 'libavcodec')
| -rw-r--r-- | libavcodec/utils.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/libavcodec/utils.c b/libavcodec/utils.c index 9aec72a8cc..72450decfd 100644 --- a/libavcodec/utils.c +++ b/libavcodec/utils.c @@ -2777,10 +2777,10 @@ int avpriv_unlock_avformat(void) unsigned int avpriv_toupper4(unsigned int x) { - return av_toupper(x & 0xFF) - + (av_toupper((x >> 8) & 0xFF) << 8) - + (av_toupper((x >> 16) & 0xFF) << 16) - + (av_toupper((x >> 24) & 0xFF) << 24); + return av_toupper(x & 0xFF) + + (av_toupper((x >> 8) & 0xFF) << 8) + + (av_toupper((x >> 16) & 0xFF) << 16) + + (av_toupper((x >> 24) & 0xFF) << 24); } #if !HAVE_THREADS |