Merge commit '9200514ad8717c63f82101dc394f4378854325bf'

* commit '9200514ad8717c63f82101dc394f4378854325bf':
  lavf: replace AVStream.codec with AVStream.codecpar

This has been a HUGE effort from:
    - Derek Buitenhuis <derek.buitenhuis@gmail.com>
    - Hendrik Leppkes <h.leppkes@gmail.com>
    - wm4 <nfxjfg@googlemail.com>
    - Clément Bœsch <clement@stupeflix.com>
    - James Almer <jamrial@gmail.com>
    - Michael Niedermayer <michael@niedermayer.cc>
    - Rostislav Pehlivanov <atomnuker@gmail.com>

Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>

1 files changed, 15 insertions, 15 deletions

diff --git a/libavformat/vivo.c b/libavformat/vivo.c
index 10d81b9142..a9effd5835 100644
--- a/libavformat/vivo.c
+++ b/libavformat/vivo.c
@@ -131,7 +131,7 @@ static int vivo_read_header(AVFormatContext *s)
     if (!ast || !vst)
         return AVERROR(ENOMEM);
 
-    ast->codec->sample_rate = 8000;
+    ast->codecpar->sample_rate = 8000;
 
     while (1) {
         if ((ret = vivo_get_packet_header(s)) < 0)
@@ -182,15 +182,15 @@ static int vivo_read_header(AVFormatContext *s)
                 if (!strcmp(key, "Duration")) {
                     duration = value_int;
                 } else if (!strcmp(key, "Width")) {
-                    vst->codec->width = value_int;
+                    vst->codecpar->width = value_int;
                 } else if (!strcmp(key, "Height")) {
-                    vst->codec->height = value_int;
+                    vst->codecpar->height = value_int;
                 } else if (!strcmp(key, "TimeUnitNumerator")) {
                     fps.num = value_int / 1000;
                 } else if (!strcmp(key, "TimeUnitDenominator")) {
                     fps.den = value_int;
                 } else if (!strcmp(key, "SamplingFrequency")) {
-                    ast->codec->sample_rate = value_int;
+                    ast->codecpar->sample_rate = value_int;
                 } else if (!strcmp(key, "NominalBitrate")) {
                 } else if (!strcmp(key, "Length")) {
                     // size of file
@@ -216,27 +216,27 @@ static int vivo_read_header(AVFormatContext *s)
         }
     }
 
-    avpriv_set_pts_info(ast, 64, 1, ast->codec->sample_rate);
+    avpriv_set_pts_info(ast, 64, 1, ast->codecpar->sample_rate);
     avpriv_set_pts_info(vst, 64, fps.num, fps.den);
     if (duration)
         s->duration = av_rescale(duration, 1000, 1);
 
     vst->start_time        = 0;
-    vst->codec->codec_tag  = 0;
-    vst->codec->codec_type = AVMEDIA_TYPE_VIDEO;
+    vst->codecpar->codec_tag  = 0;
+    vst->codecpar->codec_type = AVMEDIA_TYPE_VIDEO;
 
     if (vivo->version == 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;
+        vst->codecpar->codec_id = AV_CODEC_ID_H263;
+        ast->codecpar->codec_id = AV_CODEC_ID_G723_1;
+        ast->codecpar->bits_per_coded_sample = 8;
+        ast->codecpar->block_align = 24;
+        ast->codecpar->bit_rate = 6400;
     }
 
     ast->start_time        = 0;
-    ast->codec->codec_tag  = 0;
-    ast->codec->codec_type = AVMEDIA_TYPE_AUDIO;
-    ast->codec->channels = 1;
+    ast->codecpar->codec_tag  = 0;
+    ast->codecpar->codec_type = AVMEDIA_TYPE_AUDIO;
+    ast->codecpar->channels = 1;
 
     return 0;
 }