diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2015-05-04 17:59:45 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2015-05-04 17:59:56 +0200 |
| commit | 783e94cb119052722d38df0efa248fecc53508ab (patch) | |
| tree | 325b7d3025c336b91869e87c12238267b92fab04 /libavcodec/version.h | |
| parent | f320f2f4c6398404a8653b4a78134ab42dda9ea7 (diff) | |
| parent | 0bca6182b26a2094c5229fef4d8fe8ecb9a75e58 (diff) | |
| download | ffmpeg-783e94cb119052722d38df0efa248fecc53508ab.tar.gz | |
Merge remote-tracking branch 'cehoyos/master'
* cehoyos/master:
lavfi/cropdetect: Fix cropdetect for > 8 bit input.
lavf/apngenc: Fix png remuxing by using default extension apng.
lavf/mxfenc: Write correct interlaced flag when muxing dnxhd.
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/version.h')
| -rw-r--r-- | libavcodec/version.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/libavcodec/version.h b/libavcodec/version.h index 69f9759f01..41c41451c7 100644 --- a/libavcodec/version.h +++ b/libavcodec/version.h @@ -29,8 +29,8 @@ #include "libavutil/version.h" #define LIBAVCODEC_VERSION_MAJOR 56 -#define LIBAVCODEC_VERSION_MINOR 35 -#define LIBAVCODEC_VERSION_MICRO 101 +#define LIBAVCODEC_VERSION_MINOR 36 +#define LIBAVCODEC_VERSION_MICRO 100 #define LIBAVCODEC_VERSION_INT AV_VERSION_INT(LIBAVCODEC_VERSION_MAJOR, \ LIBAVCODEC_VERSION_MINOR, \ |