Merge commit '35818b8aaf4d669ed0bbb05c3fd06e619f2db01a'

[ffmpeg] / cmdutils.c

diff --git a/cmdutils.c b/cmdutils.c
index 052cba08cc397f1972785a8fdc8643bf370d23d1..6e7a0bb09bdf12d11dcd6506a700a95c91030b38 100644 (file)
--- a/cmdutils.c
+++ b/cmdutils.c
@@ -44,6 +44,7 @@
 #include "libavutil/display.h"
 #include "libavutil/mathematics.h"
 #include "libavutil/imgutils.h"
+#include "libavutil/libm.h"
 #include "libavutil/parseutils.h"
 #include "libavutil/pixdesc.h"
 #include "libavutil/eval.h"
@@ -481,10 +482,22 @@ static void dump_argument(const char *a)
     fputc('"', report_file);
 }
 
+static void check_options(const OptionDef *po)
+{
+    while (po->name) {
+        if (po->flags & OPT_PERFILE)
+            av_assert0(po->flags & (OPT_INPUT | OPT_OUTPUT));
+        po++;
+    }
+}
+
 void parse_loglevel(int argc, char **argv, const OptionDef *options)
 {
     int idx = locate_option(argc, argv, options, "loglevel");
     const char *env;
+
+    check_options(options);
+
     if (!idx)
         idx = locate_option(argc, argv, options, "v");
     if (idx && argv[idx + 1])
@@ -2088,7 +2101,7 @@ double get_rotation(AVStream *st)
             theta = 0;
     }
     if (displaymatrix && !theta)
-        theta = av_display_rotation_get((int32_t*) displaymatrix);
+        theta = -av_display_rotation_get((int32_t*) displaymatrix);
 
     theta -= 360*floor(theta/360 + 0.9/360);