Unified · Split
| @@ -186,6 +186,18 @@ The following abbreviations are recognized: · 185 unmodified lines | |||
| 186 | 1280x720 | 186 | 1280x720 |
| 187 | @item hd1080 | 187 | @item hd1080 |
| 188 | 1920x1080 | 188 | 1920x1080 |
| 189 | @item 2k | ||
| 190 | 2048x1080 | ||
| 191 | @item 2kflat | ||
| 192 | 1998x1080 | ||
| 193 | @item 2kscope | ||
| 194 | 2048x858 | ||
| 195 | @item 4k | ||
| 196 | 4096x2160 | ||
| 197 | @item 4kflat | ||
| 198 | 3996x2160 | ||
| 199 | @item 4kscope | ||
| 200 | 4096x1716 | ||
| 189 | @end table | 201 | @end table |
| 190 | 202 | ||
| 191 | @anchor{video rate syntax} | 203 | @anchor{video rate syntax} |
| @@ -109,6 +109,12 @@ static const VideoSizeAbbr video_size_abbrs[] = { · 108 unmodified lines | |||
| 109 | { "hd480", 852, 480 }, | 109 | { "hd480", 852, 480 }, |
| 110 | { "hd720", 1280, 720 }, | 110 | { "hd720", 1280, 720 }, |
| 111 | { "hd1080", 1920,1080 }, | 111 | { "hd1080", 1920,1080 }, |
| 112 | { "2k", 2048,1080 }, /* Digital Cinema System Specification */ | ||
| 113 | { "2kflat", 1998,1080 }, | ||
| 114 | { "2kscope", 2048, 858 }, | ||
| 115 | { "4k", 4096,2160 }, /* Digital Cinema System Specification */ | ||
| 116 | { "4kflat", 3996,2160 }, | ||
| 117 | { "4kscope", 4096,1716 }, | ||
| 112 | }; | 118 | }; |
| 113 | 119 | ||
| 114 | static const VideoRateAbbr video_rate_abbrs[]= { | 120 | static const VideoRateAbbr video_rate_abbrs[]= { |
| @@ -76,7 +76,7 @@ · 75 unmodified lines | |||
| 76 | 76 | ||
| 77 | #define LIBAVUTIL_VERSION_MAJOR 52 | 77 | #define LIBAVUTIL_VERSION_MAJOR 52 |
| 78 | #define LIBAVUTIL_VERSION_MINOR 17 | 78 | #define LIBAVUTIL_VERSION_MINOR 17 |
| 79 | #define LIBAVUTIL_VERSION_MICRO 100 | 79 | #define LIBAVUTIL_VERSION_MICRO 101 |
| 80 | 80 | ||
| 81 | #define LIBAVUTIL_VERSION_INT AV_VERSION_INT(LIBAVUTIL_VERSION_MAJOR, \ | 81 | #define LIBAVUTIL_VERSION_INT AV_VERSION_INT(LIBAVUTIL_VERSION_MAJOR, \ |
| 82 | LIBAVUTIL_VERSION_MINOR, \ | 82 | LIBAVUTIL_VERSION_MINOR, \ |