QSV: merge cleanup from trunk.

git-svn-id: svn://svn.handbrake.fr/HandBrake/branches/qsv@5372 b64f7644-9d1e-0410-96f1-a4d463321fa5

diff --git a/libhb/common.h b/libhb/common.h
index 9f320436956566ee4f2faa345a8fe145ea5ff9ac..cb8cc2f5b02c1694bb47ce9bf825de568ad62af2 100644 (file)
--- a/libhb/common.h
+++ b/libhb/common.h
@@ -361,23 +361,21 @@ struct hb_job_s
 
     /* Video settings:
          vcodec:            output codec
-         vquality:          output quality (0.0..1.0)
-                            if < 0.0 or > 1.0, bitrate is used instead,
-                            except with x264, to use its real QP/RF scale
-         vbitrate:          output bitrate (kbps)
+         vquality:          output quality (if < 0.0, bitrate is used instead)
+         vbitrate:          output bitrate (Kbps)
          vrate, vrate_base: output framerate is vrate / vrate_base
          cfr:               0 (vfr), 1 (cfr), 2 (pfr) [see render.c]
          pass:              0, 1 or 2 (or -1 for scan)
          advanced_opts:     string of extra advanced encoder options
          areBframes:        boolean to note if b-frames are included in advanced_opts */
-#define HB_VCODEC_MASK   0x0000FF
-#define HB_VCODEC_X264   0x000001
-#define HB_VCODEC_THEORA 0x000002
-#define HB_VCODEC_QSV_H264 0x000100
-#define HB_VCODEC_FFMPEG_MPEG4 0x000010
-#define HB_VCODEC_FFMPEG       HB_VCODEC_FFMPEG_MPEG4
-#define HB_VCODEC_FFMPEG_MPEG2 0x000020
-#define HB_VCODEC_FFMPEG_MASK  0x0000F0
+#define HB_VCODEC_MASK         0x0000FFF
+#define HB_VCODEC_X264         0x0000001
+#define HB_VCODEC_THEORA       0x0000002
+#define HB_VCODEC_FFMPEG_MPEG4 0x0000010
+#define HB_VCODEC_FFMPEG_MPEG2 0x0000020
+#define HB_VCODEC_FFMPEG_MASK  0x00000F0
+#define HB_VCODEC_QSV_H264     0x0000100
+#define HB_VCODEC_QSV_MASK     0x0000F00
 
     int             vcodec;
     float           vquality;