RepoMirrors
/
ffmpeg
mirror of https://git.ffmpeg.org/ffmpeg.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

avformat/matroskaenc: Make mkv_write_video_projection() return void 

It can't fail since 9c8aa86883.

Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt@gmail.com>
This commit is contained in:
Andreas Rheinhardt 2020-05-06 14:13:58 +02:00
parent 0e5ff31545
commit b921d4d013
1 changed files with 5 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
libavformat/matroskaenc.c
View File

@ -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); put_ebml_binary(pb, MATROSKA_ID_VIDEOCOLOR, colour, colorinfo_size);
} }
static int mkv_write_video_projection(AVFormatContext *s, AVIOContext *pb, static void mkv_write_video_projection(AVFormatContext *s, AVIOContext *pb,
const AVStream *st) const AVStream *st)
{ {
ebml_master projection; ebml_master projection;
int side_data_size = 0; int side_data_size = 0;
@ -927,13 +927,13 @@ static int mkv_write_video_projection(AVFormatContext *s, AVIOContext *pb,
&side_data_size); &side_data_size);
if (!side_data_size) if (!side_data_size)
return 0; return;
if (spherical->projection != AV_SPHERICAL_EQUIRECTANGULAR && if (spherical->projection != AV_SPHERICAL_EQUIRECTANGULAR &&
spherical->projection != AV_SPHERICAL_EQUIRECTANGULAR_TILE && spherical->projection != AV_SPHERICAL_EQUIRECTANGULAR_TILE &&
spherical->projection != AV_SPHERICAL_CUBEMAP) { spherical->projection != AV_SPHERICAL_CUBEMAP) {
av_log(s, AV_LOG_WARNING, "Unknown projection type\n"); 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 // 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)); (double) spherical->roll / (1 << 16));
end_ebml_master(pb, projection); end_ebml_master(pb, projection);
return 0;
} }
static void mkv_write_field_order(AVIOContext *pb, int mode, 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)); put_ebml_binary(pb, MATROSKA_ID_VIDEOCOLORSPACE, &color_space, sizeof(color_space));
} }
mkv_write_video_color(pb, st, par); 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); end_ebml_master(pb, subinfo);
break; break;