]> git.sesse.net Git - ffmpeg/commitdiff
avformat/avidec: Simplify compile-time check for DV demuxer
authorAndreas Rheinhardt <andreas.rheinhardt@gmail.com>
Tue, 26 Jan 2021 13:18:11 +0000 (14:18 +0100)
committerAndreas Rheinhardt <andreas.rheinhardt@gmail.com>
Wed, 27 Jan 2021 10:53:22 +0000 (11:53 +0100)
1b373b41d940e3058cdfb3d17703e23ed665353c made it a bit harder to find
out that a call to avpriv_dv_produce_packet is dead when the DV demuxer
is disabled; too hard for GCC on -O0. So simplify the check a bit.

Reviewed-by: Peter Ross <pross@xvid.org>
Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt@gmail.com>
libavformat/avidec.c

index e92a4499696b5f3d56657d9b1c6e8d0eeb469775..79000f3e819df7a8d9e98db9f92b4b9d287264d1 100644 (file)
@@ -1483,7 +1483,7 @@ resync:
             }
         }
 
-        if (dv_demux) {
+        if (CONFIG_DV_DEMUXER && dv_demux) {
             AVBufferRef *avbuf = pkt->buf;
             size = avpriv_dv_produce_packet(avi->dv_demux, pkt,
                                             pkt->data, pkt->size, pkt->pos);