Merge commit '66a1ccd7467ab1913cd8877114c6d4c2588bb12f'

[ffmpeg] / cmdutils.h

diff --git a/cmdutils.h b/cmdutils.h
index 1973c0731769ba46c77ed184afa8da3b82c53c98..3885d9412c9e57eef1c85d456fe69ed2736f667c 100644 (file)
--- a/cmdutils.h
+++ b/cmdutils.h
@@ -139,7 +139,7 @@ typedef struct SpecifierOpt {
     } u;
 } SpecifierOpt;
 
-typedef struct {
+typedef struct OptionDef {
     const char *name;
     int flags;
 #define HAS_ARG    0x0001
@@ -426,7 +426,7 @@ typedef struct FrameBuffer {
     int  linesize[4];
 
     int h, w;
-    enum PixelFormat pix_fmt;
+    enum AVPixelFormat pix_fmt;
 
     int refcount;
     struct FrameBuffer **pool;  ///< head of the buffer pool