diff mbox series

[FFmpeg-devel,14/21] avformat/matroskaenc: Make mkv_write_video_projection() return void

Message ID 20200507191937.16691-1-andreas.rheinhardt@gmail.com
State Accepted
Commit b921d4d013a7f4d23fbdba8800780b8171af9d5e
Headers show
Series None | expand

Commit Message

Andreas Rheinhardt May 7, 2020, 7:19 p.m. UTC 
It can't fail since 9c8aa86883f28fc27ca790b290c3be2d347b0d19.

Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt@gmail.com>
---
 libavformat/matroskaenc.c | 14 +++++---------
 1 file changed, 5 insertions(+), 9 deletions(-)
diff mbox series

Patch

diff --git a/libavformat/matroskaenc.c b/libavformat/matroskaenc.c
index d16d607269..158193738e 100644
--- a/libavformat/matroskaenc.c
+++ b/libavformat/matroskaenc.c
@@ -915,8 +915,8 @@  static void mkv_write_video_color(AVIOContext *pb, const AVStream *st,
         put_ebml_binary(pb, MATROSKA_ID_VIDEOCOLOR, colour, colorinfo_size);
 }
 
-static int mkv_write_video_projection(AVFormatContext *s, AVIOContext *pb,
-                                      const AVStream *st)
+static void mkv_write_video_projection(AVFormatContext *s, AVIOContext *pb,
+                                       const AVStream *st)
 {
     ebml_master projection;
     int side_data_size = 0;
@@ -927,13 +927,13 @@  static int mkv_write_video_projection(AVFormatContext *s, AVIOContext *pb,
                                                             &side_data_size);
 
     if (!side_data_size)
-        return 0;
+        return;
 
     if (spherical->projection != AV_SPHERICAL_EQUIRECTANGULAR      &&
         spherical->projection != AV_SPHERICAL_EQUIRECTANGULAR_TILE &&
         spherical->projection != AV_SPHERICAL_CUBEMAP) {
         av_log(s, AV_LOG_WARNING, "Unknown projection type\n");
-        return 0;
+        return;
     }
 
     // Maximally 4 8-byte elements with id-length 2 + 1 byte length field
@@ -981,8 +981,6 @@  static int mkv_write_video_projection(AVFormatContext *s, AVIOContext *pb,
                        (double) spherical->roll  / (1 << 16));
 
     end_ebml_master(pb, projection);
-
-    return 0;
 }
 
 static void mkv_write_field_order(AVIOContext *pb, int mode,
@@ -1306,10 +1304,8 @@  static int mkv_write_track(AVFormatContext *s, MatroskaMuxContext *mkv,
             put_ebml_binary(pb, MATROSKA_ID_VIDEOCOLORSPACE, &color_space, sizeof(color_space));
         }
         mkv_write_video_color(pb, st, par);
+        mkv_write_video_projection(s, pb, st);
 
-        ret = mkv_write_video_projection(s, pb, st);
-        if (ret < 0)
-            return ret;
         end_ebml_master(pb, subinfo);
         break;