diff --git a/[refs] b/[refs] index 605a822bb7d3..be7e34e9dad5 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 823902defe89b1de8caab1ae82c8916feeb19b01 +refs/heads/master: 1e3c1f7695a446742e24ea1f0c80715be98edbc4 diff --git a/trunk/include/linux/videodev2.h b/trunk/include/linux/videodev2.h index 5758066cb57b..3689d7d81fe9 100644 --- a/trunk/include/linux/videodev2.h +++ b/trunk/include/linux/videodev2.h @@ -375,6 +375,7 @@ struct v4l2_fmtdesc { }; #define V4L2_FMT_FLAG_COMPRESSED 0x0001 +#define V4L2_FMT_FLAG_EMULATED 0x0002 #if 1 /* Experimental Frame Size and frame rate enumeration */