aboutsummaryrefslogtreecommitdiffstats
path: root/libavformat/img2enc.c
diff options
context:
space:
mode:
authorMichael Niedermayer <michaelni@gmx.at>2013-03-08 14:57:41 +0100
committerMichael Niedermayer <michaelni@gmx.at>2013-03-08 14:57:41 +0100
commit6c17ff84ad8f2be64ddc9bd4955e1cc87842ac29 (patch)
tree48f9a7c9169dc29106f18a4ed13010e255d52bcb /libavformat/img2enc.c
parent80f91a70be5f03fc95eb89d222d760eeaf91b135 (diff)
parentefa7f4202088c70caba11d7834641bc6eaf41830 (diff)
downloadffmpeg-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 'libavformat/img2enc.c')
0 files changed, 0 insertions, 0 deletions