diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2015-06-08 01:10:11 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2015-06-08 01:17:26 +0200 |
| commit | ce838ad950fcf8b2a8823d7606a05077ebe91f9f (patch) | |
| tree | f179849ca6dfad3bd9921ba205cb92a9a4d9036c | |
| parent | 8985e7c56130b42f6184b064b7141e365f59356b (diff) | |
| parent | 252d6200c36e7eaa79f8d5205b7d731179e94897 (diff) | |
| download | ffmpeg-ce838ad950fcf8b2a8823d7606a05077ebe91f9f.tar.gz | |
Merge commit '252d6200c36e7eaa79f8d5205b7d731179e94897'
* commit '252d6200c36e7eaa79f8d5205b7d731179e94897':
avio: Add avio_put_str16be
Conflicts:
doc/APIchanges
libavformat/avio.h
libavformat/aviobuf.c
libavformat/version.h
The FFmpeg implementation is kept as requested by ubitux
Doxy improvements merged
Merged-by: Michael Niedermayer <michaelni@gmx.at>
| -rw-r--r-- | libavformat/avio.h | 6 | ||||
| -rw-r--r-- | libavformat/version.h | 2 |
2 files changed, 7 insertions, 1 deletions
diff --git a/libavformat/avio.h b/libavformat/avio.h index 51913e39fc..5c5aa6d0f0 100644 --- a/libavformat/avio.h +++ b/libavformat/avio.h @@ -315,12 +315,18 @@ int avio_put_str(AVIOContext *s, const char *str); /** * Convert an UTF-8 string to UTF-16LE and write it. + * @param s the AVIOContext + * @param str NULL-terminated UTF-8 string + * * @return number of bytes written. */ int avio_put_str16le(AVIOContext *s, const char *str); /** * Convert an UTF-8 string to UTF-16BE and write it. + * @param s the AVIOContext + * @param str NULL-terminated UTF-8 string + * * @return number of bytes written. */ int avio_put_str16be(AVIOContext *s, const char *str); diff --git a/libavformat/version.h b/libavformat/version.h index 67862b7890..3876b7881e 100644 --- a/libavformat/version.h +++ b/libavformat/version.h @@ -31,7 +31,7 @@ #define LIBAVFORMAT_VERSION_MAJOR 56 #define LIBAVFORMAT_VERSION_MINOR 35 -#define LIBAVFORMAT_VERSION_MICRO 100 +#define LIBAVFORMAT_VERSION_MICRO 101 #define LIBAVFORMAT_VERSION_INT AV_VERSION_INT(LIBAVFORMAT_VERSION_MAJOR, \ LIBAVFORMAT_VERSION_MINOR, \ |