See http://en.wikipedia.org/wiki/Graphics_display_resolution
Signed-off-by: Niv Sardi <xaiki@evilgiggle.com>
Signed-off-by: Stefano Sabatini <stefasab@gmail.com>
... | ... |
@@ -198,6 +198,18 @@ The following abbreviations are recognized: |
198 | 198 |
3996x2160 |
199 | 199 |
@item 4kscope |
200 | 200 |
4096x1716 |
201 |
+@item nhd |
|
202 |
+640x360 |
|
203 |
+@item hqvga |
|
204 |
+240x160 |
|
205 |
+@item wqvga |
|
206 |
+400x240 |
|
207 |
+@item fwqvga |
|
208 |
+432x240 |
|
209 |
+@item hvga |
|
210 |
+480x320 |
|
211 |
+@item qhd |
|
212 |
+960x540 |
|
201 | 213 |
@end table |
202 | 214 |
|
203 | 215 |
@anchor{video rate syntax} |
... | ... |
@@ -115,6 +115,12 @@ static const VideoSizeAbbr video_size_abbrs[] = { |
115 | 115 |
{ "4k", 4096,2160 }, /* Digital Cinema System Specification */ |
116 | 116 |
{ "4kflat", 3996,2160 }, |
117 | 117 |
{ "4kscope", 4096,1716 }, |
118 |
+ { "nhd", 640,360 }, |
|
119 |
+ { "hqvga", 240,160 }, |
|
120 |
+ { "wqvga", 400,240 }, |
|
121 |
+ { "fwqvga", 432,240 }, |
|
122 |
+ { "hvga", 480,320 }, |
|
123 |
+ { "qhd", 960,540 }, |
|
118 | 124 |
}; |
119 | 125 |
|
120 | 126 |
static const VideoRateAbbr video_rate_abbrs[]= { |
... | ... |
@@ -76,7 +76,7 @@ |
76 | 76 |
|
77 | 77 |
#define LIBAVUTIL_VERSION_MAJOR 52 |
78 | 78 |
#define LIBAVUTIL_VERSION_MINOR 46 |
79 |
-#define LIBAVUTIL_VERSION_MICRO 100 |
|
79 |
+#define LIBAVUTIL_VERSION_MICRO 101 |
|
80 | 80 |
|
81 | 81 |
#define LIBAVUTIL_VERSION_INT AV_VERSION_INT(LIBAVUTIL_VERSION_MAJOR, \ |
82 | 82 |
LIBAVUTIL_VERSION_MINOR, \ |