Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>tags/n3.3
| @@ -1 +1 @@ | |||||
| 3.2.git | |||||
| 3.3.git | |||||
| @@ -28,7 +28,7 @@ | |||||
| #include "libavutil/version.h" | #include "libavutil/version.h" | ||||
| #define LIBAVCODEC_VERSION_MAJOR 57 | #define LIBAVCODEC_VERSION_MAJOR 57 | ||||
| #define LIBAVCODEC_VERSION_MINOR 87 | |||||
| #define LIBAVCODEC_VERSION_MINOR 88 | |||||
| #define LIBAVCODEC_VERSION_MICRO 100 | #define LIBAVCODEC_VERSION_MICRO 100 | ||||
| #define LIBAVCODEC_VERSION_INT AV_VERSION_INT(LIBAVCODEC_VERSION_MAJOR, \ | #define LIBAVCODEC_VERSION_INT AV_VERSION_INT(LIBAVCODEC_VERSION_MAJOR, \ | ||||
| @@ -28,7 +28,7 @@ | |||||
| #include "libavutil/version.h" | #include "libavutil/version.h" | ||||
| #define LIBAVDEVICE_VERSION_MAJOR 57 | #define LIBAVDEVICE_VERSION_MAJOR 57 | ||||
| #define LIBAVDEVICE_VERSION_MINOR 4 | |||||
| #define LIBAVDEVICE_VERSION_MINOR 5 | |||||
| #define LIBAVDEVICE_VERSION_MICRO 100 | #define LIBAVDEVICE_VERSION_MICRO 100 | ||||
| #define LIBAVDEVICE_VERSION_INT AV_VERSION_INT(LIBAVDEVICE_VERSION_MAJOR, \ | #define LIBAVDEVICE_VERSION_INT AV_VERSION_INT(LIBAVDEVICE_VERSION_MAJOR, \ | ||||
| @@ -30,7 +30,7 @@ | |||||
| #include "libavutil/version.h" | #include "libavutil/version.h" | ||||
| #define LIBAVFILTER_VERSION_MAJOR 6 | #define LIBAVFILTER_VERSION_MAJOR 6 | ||||
| #define LIBAVFILTER_VERSION_MINOR 80 | |||||
| #define LIBAVFILTER_VERSION_MINOR 81 | |||||
| #define LIBAVFILTER_VERSION_MICRO 100 | #define LIBAVFILTER_VERSION_MICRO 100 | ||||
| #define LIBAVFILTER_VERSION_INT AV_VERSION_INT(LIBAVFILTER_VERSION_MAJOR, \ | #define LIBAVFILTER_VERSION_INT AV_VERSION_INT(LIBAVFILTER_VERSION_MAJOR, \ | ||||
| @@ -32,7 +32,7 @@ | |||||
| // Major bumping may affect Ticket5467, 5421, 5451(compatibility with Chromium) | // Major bumping may affect Ticket5467, 5421, 5451(compatibility with Chromium) | ||||
| // Also please add any ticket numbers that you believe might be affected here | // Also please add any ticket numbers that you believe might be affected here | ||||
| #define LIBAVFORMAT_VERSION_MAJOR 57 | #define LIBAVFORMAT_VERSION_MAJOR 57 | ||||
| #define LIBAVFORMAT_VERSION_MINOR 69 | |||||
| #define LIBAVFORMAT_VERSION_MINOR 70 | |||||
| #define LIBAVFORMAT_VERSION_MICRO 100 | #define LIBAVFORMAT_VERSION_MICRO 100 | ||||
| #define LIBAVFORMAT_VERSION_INT AV_VERSION_INT(LIBAVFORMAT_VERSION_MAJOR, \ | #define LIBAVFORMAT_VERSION_INT AV_VERSION_INT(LIBAVFORMAT_VERSION_MAJOR, \ | ||||
| @@ -28,7 +28,7 @@ | |||||
| #include "libavutil/version.h" | #include "libavutil/version.h" | ||||
| #define LIBAVRESAMPLE_VERSION_MAJOR 3 | #define LIBAVRESAMPLE_VERSION_MAJOR 3 | ||||
| #define LIBAVRESAMPLE_VERSION_MINOR 3 | |||||
| #define LIBAVRESAMPLE_VERSION_MINOR 4 | |||||
| #define LIBAVRESAMPLE_VERSION_MICRO 0 | #define LIBAVRESAMPLE_VERSION_MICRO 0 | ||||
| #define LIBAVRESAMPLE_VERSION_INT AV_VERSION_INT(LIBAVRESAMPLE_VERSION_MAJOR, \ | #define LIBAVRESAMPLE_VERSION_INT AV_VERSION_INT(LIBAVRESAMPLE_VERSION_MAJOR, \ | ||||
| @@ -79,7 +79,7 @@ | |||||
| */ | */ | ||||
| #define LIBAVUTIL_VERSION_MAJOR 55 | #define LIBAVUTIL_VERSION_MAJOR 55 | ||||
| #define LIBAVUTIL_VERSION_MINOR 55 | |||||
| #define LIBAVUTIL_VERSION_MINOR 56 | |||||
| #define LIBAVUTIL_VERSION_MICRO 100 | #define LIBAVUTIL_VERSION_MICRO 100 | ||||
| #define LIBAVUTIL_VERSION_INT AV_VERSION_INT(LIBAVUTIL_VERSION_MAJOR, \ | #define LIBAVUTIL_VERSION_INT AV_VERSION_INT(LIBAVUTIL_VERSION_MAJOR, \ | ||||
| @@ -29,7 +29,7 @@ | |||||
| #include "libavutil/avutil.h" | #include "libavutil/avutil.h" | ||||
| #define LIBPOSTPROC_VERSION_MAJOR 54 | #define LIBPOSTPROC_VERSION_MAJOR 54 | ||||
| #define LIBPOSTPROC_VERSION_MINOR 3 | |||||
| #define LIBPOSTPROC_VERSION_MINOR 4 | |||||
| #define LIBPOSTPROC_VERSION_MICRO 100 | #define LIBPOSTPROC_VERSION_MICRO 100 | ||||
| #define LIBPOSTPROC_VERSION_INT AV_VERSION_INT(LIBPOSTPROC_VERSION_MAJOR, \ | #define LIBPOSTPROC_VERSION_INT AV_VERSION_INT(LIBPOSTPROC_VERSION_MAJOR, \ | ||||
| @@ -29,7 +29,7 @@ | |||||
| #include "libavutil/avutil.h" | #include "libavutil/avutil.h" | ||||
| #define LIBSWRESAMPLE_VERSION_MAJOR 2 | #define LIBSWRESAMPLE_VERSION_MAJOR 2 | ||||
| #define LIBSWRESAMPLE_VERSION_MINOR 5 | |||||
| #define LIBSWRESAMPLE_VERSION_MINOR 6 | |||||
| #define LIBSWRESAMPLE_VERSION_MICRO 100 | #define LIBSWRESAMPLE_VERSION_MICRO 100 | ||||
| #define LIBSWRESAMPLE_VERSION_INT AV_VERSION_INT(LIBSWRESAMPLE_VERSION_MAJOR, \ | #define LIBSWRESAMPLE_VERSION_INT AV_VERSION_INT(LIBSWRESAMPLE_VERSION_MAJOR, \ | ||||
| @@ -27,7 +27,7 @@ | |||||
| #include "libavutil/version.h" | #include "libavutil/version.h" | ||||
| #define LIBSWSCALE_VERSION_MAJOR 4 | #define LIBSWSCALE_VERSION_MAJOR 4 | ||||
| #define LIBSWSCALE_VERSION_MINOR 4 | |||||
| #define LIBSWSCALE_VERSION_MINOR 5 | |||||
| #define LIBSWSCALE_VERSION_MICRO 100 | #define LIBSWSCALE_VERSION_MICRO 100 | ||||
| #define LIBSWSCALE_VERSION_INT AV_VERSION_INT(LIBSWSCALE_VERSION_MAJOR, \ | #define LIBSWSCALE_VERSION_INT AV_VERSION_INT(LIBSWSCALE_VERSION_MAJOR, \ | ||||