convert every muxer/demuxer to write/read sample_aspect_ratio from/to

[ffmpeg] / libavformat / dv.c

diff --git a/libavformat/dv.c b/libavformat/dv.c
index 0f4c5cf0b4040b1903404d835b3e0d15c56211e3..0670e5149ccaa8866a68d109a3c5ee0a0118afda 100644 (file)
--- a/libavformat/dv.c
+++ b/libavformat/dv.c
@@ -29,7 +29,7 @@
  */
 #include <time.h>
 #include "avformat.h"
-#include "dvdata.h"
+#include "libavcodec/dvdata.h"
 #include "dv.h"
 
 struct DVDemuxContext {
@@ -247,7 +247,7 @@ static int dv_extract_video_info(DVDemuxContext *c, uint8_t* frame)
         apt = frame[4] & 0x07;
         is16_9 = (vsc_pack && ((vsc_pack[2] & 0x07) == 0x02 ||
                                (!apt && (vsc_pack[2] & 0x07) == 0x07)));
-        avctx->sample_aspect_ratio = c->sys->sar[is16_9];
+        c->vst->sample_aspect_ratio = c->sys->sar[is16_9];
         avctx->bit_rate = av_rescale(c->sys->frame_size * 8,
                                      c->sys->frame_rate,
                                      c->sys->frame_rate_base);
@@ -440,7 +440,7 @@ static int dv_read_close(AVFormatContext *s)
 #ifdef CONFIG_DV_DEMUXER
 AVInputFormat dv_demuxer = {
     "dv",
-    "DV video format",
+    NULL_IF_CONFIG_SMALL("DV video format"),
     sizeof(RawDVContext),
     NULL,
     dv_read_header,