X-Git-Url: https://cinelerra-gg.org/git/?a=blobdiff_plain;f=cinelerra-5.1%2Fcinelerra%2Fasset.h;h=ce922c22c1e61aaed9c35a73f0a348d975b74527;hb=b2d226c1f41e84bbb3af93ebc0aa89f98ec0fd52;hp=92b15794ced82f6f31a2144c87ad78c114564cf4;hpb=01c087cf8b098c6cd424cb2cb3778f3b1317fa21;p=goodguy%2Fcinelerra.git diff --git a/cinelerra-5.1/cinelerra/asset.h b/cinelerra-5.1/cinelerra/asset.h index 92b15794..ce922c22 100644 --- a/cinelerra-5.1/cinelerra/asset.h +++ b/cinelerra-5.1/cinelerra/asset.h @@ -147,8 +147,8 @@ public: int actual_width, actual_height; int width, height; -// scale factor or 0 if not proxy - int proxy_scale; +// scale factor or 0 if not proxy, proxy_edl if proxyed from nested_edl + int proxy_scale, proxy_edl; // String or FourCC describing compression char vcodec[BCTEXTLEN];