[FFmpeg-cvslog] avdevice/iec61883: #if unused code away, fix -O0 compilation

Andreas Rheinhardt git at videolan.org
Sat Jan 8 20:45:36 EET 2022


ffmpeg | branch: release/5.0 | Andreas Rheinhardt <andreas.rheinhardt at outlook.com> | Thu Jan  6 20:59:32 2022 +0100| [60604702cd4b33c3f12bc5eaf8bc11802f5ebe36] | committer: Andreas Rheinhardt

avdevice/iec61883: #if unused code away, fix -O0 compilation

iec61883_parse_queue_hdv() is only called when the mpegts-demuxer
is available and can be optimized away when not. Yet this
optimization is not a given and it fails with e.g. GCC 11 when
using -O0 in which case one will get a compilation error
because the call to the unavailable avpriv_mpegts_parse_packet()
is not optimized away. Therefore #if the offending code away
in this case.

Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt at outlook.com>
(cherry picked from commit ad0b4afec57381c74f57dd3f3c65c49cc406c9fd)

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=60604702cd4b33c3f12bc5eaf8bc11802f5ebe36
---

 libavdevice/iec61883.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/libavdevice/iec61883.c b/libavdevice/iec61883.c
index e7b71c757a..72e14abff2 100644
--- a/libavdevice/iec61883.c
+++ b/libavdevice/iec61883.c
@@ -220,6 +220,7 @@ static int iec61883_parse_queue_dv(struct iec61883_data *dv, AVPacket *pkt)
 
 static int iec61883_parse_queue_hdv(struct iec61883_data *dv, AVPacket *pkt)
 {
+#if CONFIG_MPEGTS_DEMUXER
     DVPacket *packet;
     int size;
 
@@ -235,7 +236,7 @@ static int iec61883_parse_queue_hdv(struct iec61883_data *dv, AVPacket *pkt)
         if (size > 0)
             return size;
     }
-
+#endif
     return -1;
 }
 



More information about the ffmpeg-cvslog mailing list