diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-05-02 18:46:20 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-05-02 18:46:25 +0200 |
| commit | cea9ee5dbd9312076676693be4dfadb0664ea420 (patch) | |
| tree | 54798510ff5c7fc69501edbb28df4a8127bca668 /libavdevice/version.h | |
| parent | 41a679000f22884017107e90bfbcf2069c69d08c (diff) | |
| parent | fa4f7b17bc120effb82874538d895da1c92ba886 (diff) | |
| download | ffmpeg-cea9ee5dbd9312076676693be4dfadb0664ea420.tar.gz | |
Merge remote-tracking branch 'lukaszmluki/master'
* lukaszmluki/master:
lavd/xv: reident after previous commits
lavf/mux: pass options to nested structs of priv data
lavu/opt: add av_opt_set_dict2() function
lavd/opengl_enc: fix window size correction code
lavd/opengl_enc: add window size param
lavd/opengl_enc: use flag to mark inited context
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavdevice/version.h')
| -rw-r--r-- | libavdevice/version.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/libavdevice/version.h b/libavdevice/version.h index 4267872042..163a4c63c2 100644 --- a/libavdevice/version.h +++ b/libavdevice/version.h @@ -29,7 +29,7 @@ #define LIBAVDEVICE_VERSION_MAJOR 55 #define LIBAVDEVICE_VERSION_MINOR 13 -#define LIBAVDEVICE_VERSION_MICRO 100 +#define LIBAVDEVICE_VERSION_MICRO 101 #define LIBAVDEVICE_VERSION_INT AV_VERSION_INT(LIBAVDEVICE_VERSION_MAJOR, \ LIBAVDEVICE_VERSION_MINOR, \ |