diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-03-20 11:24:11 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-03-20 11:24:11 +0100 |
| commit | 17ebef2fc8094a235c0f30ce247c77659ea86539 (patch) | |
| tree | e5e435fe4269c33888e1f55fc09b32e787e3479e /libavutil/version.h | |
| parent | db8403d04afc025278f611d43a91429bbfa44026 (diff) | |
| parent | 2c328a907978b61949fd20f7c991803174337855 (diff) | |
| download | ffmpeg-17ebef2fc8094a235c0f30ce247c77659ea86539.tar.gz | |
Merge commit '2c328a907978b61949fd20f7c991803174337855'
* commit '2c328a907978b61949fd20f7c991803174337855':
pixdesc: add a function for counting planes in a pixel format.
avplay: remove the -debug option.
Revert "asfenc: return error on negative timestamp"
Conflicts:
doc/APIchanges
doc/ffplay.texi
ffplay.c
libavutil/version.h
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavutil/version.h')
| -rw-r--r-- | libavutil/version.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/libavutil/version.h b/libavutil/version.h index b8f814f587..1ff9ffeb92 100644 --- a/libavutil/version.h +++ b/libavutil/version.h @@ -75,8 +75,8 @@ */ #define LIBAVUTIL_VERSION_MAJOR 52 -#define LIBAVUTIL_VERSION_MINOR 19 -#define LIBAVUTIL_VERSION_MICRO 101 +#define LIBAVUTIL_VERSION_MINOR 20 +#define LIBAVUTIL_VERSION_MICRO 100 #define LIBAVUTIL_VERSION_INT AV_VERSION_INT(LIBAVUTIL_VERSION_MAJOR, \ LIBAVUTIL_VERSION_MINOR, \ |