Merge commit '874838dc6589d978611c89a40694a5074f892a76'

[ffmpeg] / libavformat / dv.c

diff --git a/libavformat/dv.c b/libavformat/dv.c
index 359040662da2de9563f608b0506f8bcb8a9d299d..f972478f6999686d5390a97daadf92c0d3dbf580 100644 (file)
--- a/libavformat/dv.c
+++ b/libavformat/dv.c
@@ -32,7 +32,7 @@
 #include "avformat.h"
 #include "internal.h"
 #include "libavcodec/dv_profile.h"
-#include "libavcodec/dvdata.h"
+#include "libavcodec/dv.h"
 #include "libavutil/channel_layout.h"
 #include "libavutil/intreadwrite.h"
 #include "libavutil/mathematics.h"
@@ -582,7 +582,7 @@ static int dv_read_close(AVFormatContext *s)
 
 static int dv_probe(AVProbeData *p)
 {
-    unsigned state, marker_pos = 0;
+    unsigned marker_pos = 0;
     int i;
     int matches           = 0;
     int firstmatch        = 0;