Merge remote-tracking branch 'origin/rettichschnidi' into unstable

Conflicts:
	examples/am7xxx-play.c

diff --cc examples/am7xxx-play.c
index 56fd8b2,9961a8e..5aa53ae
--- 1/examples/am7xxx-play.c
--- 2/examples/am7xxx-play.c
+++ b/examples/am7xxx-play.c
@@@ -567,8 -563,9 +567,10 @@@ static void usage(char *name
        printf("\t\t\t\tSUPPORTED FORMATS:\n");
        printf("\t\t\t\t\t1 - JPEG\n");
        printf("\t\t\t\t\t2 - NV12\n");
-       printf("\t-q \t\t\tquality of jpeg sent to the device, between 1 and 100\n");
+       printf("\t-q <quality>\t\tquality of jpeg sent to the device, between 1 and 100\n");
 +      printf("\t-l <log level>\t\tthe verbosity level of libam7xxx output (0-5)\n");
+       printf("\t-p <power level>\tpower level of device, between %x (off) and %x (maximum)\n", AM7XXX_POWER_OFF, AM7XXX_POWER_TURBO);
+       printf("\t\t\t\tWARNING: Level 2 and greater require the master AND\n\t\t\t\t\t the slave connector to be plugged in.\n");
        printf("\t-h \t\t\tthis help message\n");
        printf("\n\nEXAMPLES OF USE:\n");
        printf("\t%s -f x11grab -i :0.0 -o video_size=800x480\n", name);
@@@ -590,12 -587,12 +592,13 @@@ int main(int argc, char *argv[]
        unsigned int rescale_method = SWS_BICUBIC;
        unsigned int upscale = 0;
        unsigned int quality = 95;
 +      int log_level = AM7XXX_LOG_INFO;
+       am7xxx_power_mode power_mode = AM7XXX_POWER_LOW;
        int format = AM7XXX_IMAGE_FORMAT_JPEG;
        am7xxx_context *ctx;
        am7xxx_device *dev;
  
-       while ((opt = getopt(argc, argv, "f:i:o:s:uF:q:l:h")) != -1) {
 -      while ((opt = getopt(argc, argv, "f:i:o:s:uF:q:hp:")) != -1) {
++      while ((opt = getopt(argc, argv, "f:i:o:s:uF:q:l:hp:")) != -1) {
                switch (opt) {
                case 'f':
                        input_format_string = strdup(optarg);
@@@ -665,16 -662,9 +668,16 @@@
                        if (quality < 1 || quality > 100) {
                                fprintf(stderr, "Invalid quality value, must be between 1 and 100\n");
                                ret = -EINVAL;
-                               goto out;;
+                               goto out;
                        }
                        break;
 +              case 'l':
 +                      log_level = atoi(optarg);
 +                      if (log_level < AM7XXX_LOG_FATAL || log_level > AM7XXX_LOG_TRACE) {
 +                              fprintf(stderr, "Unsupported log level, falling back to AM7XXX_LOG_ERROR\n");
 +                              log_level = AM7XXX_LOG_ERROR;
 +                      }
 +                      break;
                case 'h':
                        usage(argv[0]);
                        ret = 0;