mov: Wrap stsc index and count compare in a separate function

[ffmpeg] / libavformat / filmstripenc.c

diff --git a/libavformat/filmstripenc.c b/libavformat/filmstripenc.c
index 8d1d2d83657162d2c03243a5bb69cd34fc92cb20..5a09691a708164a681112efc1f13173795e6f329 100644 (file)
--- a/libavformat/filmstripenc.c
+++ b/libavformat/filmstripenc.c
@@ -29,13 +29,13 @@
 
 #define RAND_TAG MKBETAG('R','a','n','d')
 
-typedef struct {
+typedef struct FilmstripMuxContext {
     int nb_frames;
 } FilmstripMuxContext;
 
 static int write_header(AVFormatContext *s)
 {
-    if (s->streams[0]->codec->pix_fmt != AV_PIX_FMT_RGBA) {
+    if (s->streams[0]->codecpar->format != AV_PIX_FMT_RGBA) {
         av_log(s, AV_LOG_ERROR, "only AV_PIX_FMT_RGBA is supported\n");
         return AVERROR_INVALIDDATA;
     }
@@ -61,8 +61,8 @@ static int write_trailer(AVFormatContext *s)
     avio_wb32(pb, film->nb_frames);
     avio_wb16(pb, 0);  // packing method
     avio_wb16(pb, 0);  // reserved
-    avio_wb16(pb, st->codec->width);
-    avio_wb16(pb, st->codec->height);
+    avio_wb16(pb, st->codecpar->width);
+    avio_wb16(pb, st->codecpar->height);
     avio_wb16(pb, 0);  // leading
     // TODO: should be avg_frame_rate
     avio_wb16(pb, 1/av_q2d(st->time_base));