3.2.0

cainmagi · cainmagi · commit 1553da11d084 · 2022-04-08T04:21:47.000-05:00
Fix a severe bug caused by wrong returned data type.
diff --git a/MpegCoder/MpegCoder.cpp b/MpegCoder/MpegCoder.cpp
@@ -1180,7 +1180,7 @@ const cmpc::AVCodec* cmpc::CMpegEncoder::__add_stream() {
                     SCALE_FLAGS, nullptr, nullptr, nullptr);
                 if (!PStreamContex.sws_ctx) {
                     cerr << "Could not initialize the conversion context" << endl;
-                    return false;
+                    return nullptr;
                 }
             }
         }
@@ -1192,7 +1192,7 @@ const cmpc::AVCodec* cmpc::CMpegEncoder::__add_stream() {
                 SCALE_FLAGS, nullptr, nullptr, nullptr);
             if (!PswsCtx) {
                 cerr << "Could not initialize the conversion context" << endl;
-                return false;
+                return nullptr;
             }
         }
         if (!RGBbuffer) {
diff --git a/MpegCoder/MpegStreamer.cpp b/MpegCoder/MpegStreamer.cpp
@@ -1290,7 +1290,7 @@ const cmpc::AVCodec* cmpc::CMpegServer::__add_stream() {
                     SCALE_FLAGS, nullptr, nullptr, nullptr);
                 if (!PStreamContex.sws_ctx) {
                     cerr << "Could not initialize the conversion context" << endl;
-                    return false;
+                    return nullptr;
                 }
             }
         }
@@ -1302,7 +1302,7 @@ const cmpc::AVCodec* cmpc::CMpegServer::__add_stream() {
                 SCALE_FLAGS, nullptr, nullptr, nullptr);
             if (!PswsCtx) {
                 cerr << "Could not initialize the conversion context" << endl;
-                return false;
+                return nullptr;
             }
         }
         if (!RGBbuffer) {

Original file line number	Diff line number	Diff line change
`@@ -1180,7 +1180,7 @@ const cmpc::AVCodec* cmpc::CMpegEncoder::__add_stream() {`
`1180`	`1180`	`SCALE_FLAGS, nullptr, nullptr, nullptr);`
`1181`	`1181`	`if (!PStreamContex.sws_ctx) {`
`1182`	`1182`	`cerr << "Could not initialize the conversion context" << endl;`
`1183`		`- return false;`
	`1183`	`+ return nullptr;`
`1184`	`1184`	`}`
`1185`	`1185`	`}`
`1186`	`1186`	`}`
`@@ -1192,7 +1192,7 @@ const cmpc::AVCodec* cmpc::CMpegEncoder::__add_stream() {`
`1192`	`1192`	`SCALE_FLAGS, nullptr, nullptr, nullptr);`
`1193`	`1193`	`if (!PswsCtx) {`
`1194`	`1194`	`cerr << "Could not initialize the conversion context" << endl;`
`1195`		`- return false;`
	`1195`	`+ return nullptr;`
`1196`	`1196`	`}`
`1197`	`1197`	`}`
`1198`	`1198`	`if (!RGBbuffer) {`
Original file line number	Diff line number	Diff line change
`@@ -1290,7 +1290,7 @@ const cmpc::AVCodec* cmpc::CMpegServer::__add_stream() {`
`1290`	`1290`	`SCALE_FLAGS, nullptr, nullptr, nullptr);`
`1291`	`1291`	`if (!PStreamContex.sws_ctx) {`
`1292`	`1292`	`cerr << "Could not initialize the conversion context" << endl;`
`1293`		`- return false;`
	`1293`	`+ return nullptr;`
`1294`	`1294`	`}`
`1295`	`1295`	`}`
`1296`	`1296`	`}`
`@@ -1302,7 +1302,7 @@ const cmpc::AVCodec* cmpc::CMpegServer::__add_stream() {`
`1302`	`1302`	`SCALE_FLAGS, nullptr, nullptr, nullptr);`
`1303`	`1303`	`if (!PswsCtx) {`
`1304`	`1304`	`cerr << "Could not initialize the conversion context" << endl;`
`1305`		`- return false;`
	`1305`	`+ return nullptr;`
`1306`	`1306`	`}`
`1307`	`1307`	`}`
`1308`	`1308`	`if (!RGBbuffer) {`