Merge commit 'bd255f9feb4deea4c990e582f0ba3b90d7b64b4c'

[ffmpeg] / libavformat / vivo.c

diff --git a/libavformat/vivo.c b/libavformat/vivo.c
index e3487f67c04e48020875fc338131da1a4808f935..e0a1814446a78565c569566de55973aa633c4e16 100644 (file)
--- a/libavformat/vivo.c
+++ b/libavformat/vivo.c
@@ -226,9 +226,11 @@ static int vivo_read_header(AVFormatContext *s)
     vst->codec->codec_type = AVMEDIA_TYPE_VIDEO;
 
     if (vivo->version == 1) {
-        vst->codec->codec_id = CODEC_ID_H263;
-        ast->codec->codec_id = CODEC_ID_G723_1;
+        vst->codec->codec_id = AV_CODEC_ID_H263;
+        ast->codec->codec_id = AV_CODEC_ID_G723_1;
         ast->codec->bits_per_coded_sample = 8;
+        ast->codec->block_align = 24;
+        ast->codec->bit_rate = 6400;
     }
 
     ast->start_time        = 0;