diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-05-07 10:47:25 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-05-07 10:49:40 +0200 |
| commit | 60fd88059a62c9237893ff6d159c28cd929aadf0 (patch) | |
| tree | b7f52ad5930cfb9257dc761ab1161e5df25ddfaa /libavutil/version.h | |
| parent | 399f6ef971eb992f612ddb9aa50ecc3aa378d0c8 (diff) | |
| parent | 74652af821d7e526a6541876a637fbf81261fa8e (diff) | |
| download | ffmpeg-60fd88059a62c9237893ff6d159c28cd929aadf0.tar.gz | |
Merge commit '74652af821d7e526a6541876a637fbf81261fa8e'
* commit '74652af821d7e526a6541876a637fbf81261fa8e':
pixdesc: add function to return pixel format with swapped endiannes
Conflicts:
libavutil/pixdesc.c
libavutil/version.h
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavutil/version.h')
| -rw-r--r-- | libavutil/version.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/libavutil/version.h b/libavutil/version.h index d59eac5071..4d876313b3 100644 --- a/libavutil/version.h +++ b/libavutil/version.h @@ -75,7 +75,7 @@ */ #define LIBAVUTIL_VERSION_MAJOR 52 -#define LIBAVUTIL_VERSION_MINOR 29 +#define LIBAVUTIL_VERSION_MINOR 30 #define LIBAVUTIL_VERSION_MICRO 100 #define LIBAVUTIL_VERSION_INT AV_VERSION_INT(LIBAVUTIL_VERSION_MAJOR, \ |