3.2.0

cainmagi · cainmagi · commit a8f1c6a43892 · 2022-04-08T03:10:29.000-05:00
Fix two severe bugs.
diff --git a/MpegCoder/MpegCoder.cpp b/MpegCoder/MpegCoder.cpp
@@ -1175,7 +1175,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;
                 }
             }
         }
@@ -1187,7 +1187,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
@@ -1289,7 +1289,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;
                 }
             }
         }
@@ -1301,7 +1301,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
`@@ -1175,7 +1175,7 @@ const cmpc::AVCodec* cmpc::CMpegEncoder::__add_stream() {`
`1175`	`1175`	`SCALE_FLAGS, nullptr, nullptr, nullptr);`
`1176`	`1176`	`if (!PStreamContex.sws_ctx) {`
`1177`	`1177`	`cerr << "Could not initialize the conversion context" << endl;`
`1178`		`- return false;`
	`1178`	`+ return nullptr;`
`1179`	`1179`	`}`
`1180`	`1180`	`}`
`1181`	`1181`	`}`
`@@ -1187,7 +1187,7 @@ const cmpc::AVCodec* cmpc::CMpegEncoder::__add_stream() {`
`1187`	`1187`	`SCALE_FLAGS, nullptr, nullptr, nullptr);`
`1188`	`1188`	`if (!PswsCtx) {`
`1189`	`1189`	`cerr << "Could not initialize the conversion context" << endl;`
`1190`		`- return false;`
	`1190`	`+ return nullptr;`
`1191`	`1191`	`}`
`1192`	`1192`	`}`
`1193`	`1193`	`if (!RGBbuffer) {`
Original file line number	Diff line number	Diff line change
`@@ -1289,7 +1289,7 @@ const cmpc::AVCodec* cmpc::CMpegServer::__add_stream() {`
`1289`	`1289`	`SCALE_FLAGS, nullptr, nullptr, nullptr);`
`1290`	`1290`	`if (!PStreamContex.sws_ctx) {`
`1291`	`1291`	`cerr << "Could not initialize the conversion context" << endl;`
`1292`		`- return false;`
	`1292`	`+ return nullptr;`
`1293`	`1293`	`}`
`1294`	`1294`	`}`
`1295`	`1295`	`}`
`@@ -1301,7 +1301,7 @@ const cmpc::AVCodec* cmpc::CMpegServer::__add_stream() {`
`1301`	`1301`	`SCALE_FLAGS, nullptr, nullptr, nullptr);`
`1302`	`1302`	`if (!PswsCtx) {`
`1303`	`1303`	`cerr << "Could not initialize the conversion context" << endl;`
`1304`		`- return false;`
	`1304`	`+ return nullptr;`
`1305`	`1305`	`}`
`1306`	`1306`	`}`
`1307`	`1307`	`if (!RGBbuffer) {`