All id3 parsers are buggy, 0 termination fix 1 of n (issue created by andreas

[ffmpeg] / libavformat / dvenc.c

diff --git a/libavformat/dvenc.c b/libavformat/dvenc.c
index 0d60028182fd54c5dab6cf8a80cbe39c901f67f2..845b8512923a98498c4427087b000f8147f48820 100644 (file)
--- a/libavformat/dvenc.c
+++ b/libavformat/dvenc.c
@@ -30,9 +30,9 @@
 #include <time.h>
 #include <stdarg.h>
 #include "avformat.h"
-#include "dvdata.h"
+#include "libavcodec/dvdata.h"
 #include "dv.h"
-#include "fifo.h"
+#include "libavutil/fifo.h"
 
 struct DVMuxContext {
     const DVprofile*  sys;    /* Current DV profile. E.g.: 525/60, 625/50 */
@@ -253,7 +253,7 @@ int dv_assemble_frame(DVMuxContext *c, AVStream* st,
           /* FIXME: we have to have more sensible approach than this one */
         if (av_fifo_size(&c->audio_data[i]) + data_size >= 100*AVCODEC_MAX_AUDIO_FRAME_SIZE)
             av_log(st->codec, AV_LOG_ERROR, "Can't process DV frame #%d. Insufficient video data or severe sync problem.\n", c->frames);
-        av_fifo_write(&c->audio_data[i], data, data_size);
+        av_fifo_generic_write(&c->audio_data[i], data, data_size, NULL);
 
         /* Lets see if we've got enough audio for one DV frame */
         c->has_audio |= ((reqasize <= av_fifo_size(&c->audio_data[i])) << i);
@@ -402,7 +402,7 @@ static int dv_write_trailer(struct AVFormatContext *s)
 #ifdef CONFIG_DV_MUXER
 AVOutputFormat dv_muxer = {
     "dv",
-    "DV video format",
+    NULL_IF_CONFIG_SMALL("DV video format"),
     NULL,
     "dv",
     sizeof(DVMuxContext),