[FFmpeg-cvslog] lavu/parseutils: add more resolutions

[Niv Sardi]

ffmpeg | branch: master | Niv Sardi <xaiki at evilgiggle.com> | Fri Oct  4 11:36:53 2013 -0300| [49ba6e56bd321da0e066de6533592131894b8902] | committer: Stefano Sabatini

lavu/parseutils: add more resolutions

See http://en.wikipedia.org/wiki/Graphics_display_resolution

Signed-off-by: Niv Sardi <xaiki at evilgiggle.com>
Signed-off-by: Stefano Sabatini <stefasab at gmail.com>

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=49ba6e56bd321da0e066de6533592131894b8902
---

 doc/utils.texi         |   12 ++++++++++++
 libavutil/parseutils.c |    6 ++++++
 libavutil/version.h    |    2 +-
 3 files changed, 19 insertions(+), 1 deletion(-)

diff --git a/doc/utils.texi b/doc/utils.texi
index 75f7fdc..243973d 100644
--- a/doc/utils.texi
+++ b/doc/utils.texi
@@ -198,6 +198,18 @@ The following abbreviations are recognized:
 3996x2160
 @item 4kscope
 4096x1716
+ at item nhd
+640x360
+ at item hqvga
+240x160
+ at item wqvga
+400x240
+ at item fwqvga
+432x240
+ at item hvga
+480x320
+ at item qhd
+960x540
 @end table
 
 @anchor{video rate syntax}
diff --git a/libavutil/parseutils.c b/libavutil/parseutils.c
index 5797e9e..1e1b93e 100644
--- a/libavutil/parseutils.c
+++ b/libavutil/parseutils.c
@@ -115,6 +115,12 @@ static const VideoSizeAbbr video_size_abbrs[] = {
     { "4k",       4096,2160 }, /* Digital Cinema System Specification */
     { "4kflat",   3996,2160 },
     { "4kscope",  4096,1716 },
+    { "nhd",       640,360  },
+    { "hqvga",     240,160  },
+    { "wqvga",     400,240  },
+    { "fwqvga",    432,240  },
+    { "hvga",      480,320  },
+    { "qhd",       960,540  },
 };
 
 static const VideoRateAbbr video_rate_abbrs[]= {
diff --git a/libavutil/version.h b/libavutil/version.h
index cc64e4a..41e479c 100644
--- a/libavutil/version.h
+++ b/libavutil/version.h
@@ -76,7 +76,7 @@
 
 #define LIBAVUTIL_VERSION_MAJOR  52
 #define LIBAVUTIL_VERSION_MINOR  46
-#define LIBAVUTIL_VERSION_MICRO 100
+#define LIBAVUTIL_VERSION_MICRO 101
 
 #define LIBAVUTIL_VERSION_INT   AV_VERSION_INT(LIBAVUTIL_VERSION_MAJOR, \
                                                LIBAVUTIL_VERSION_MINOR, \