[FFmpeg-cvslog] avformat/avidec: Simplify compile-time check for DV demuxer
Andreas Rheinhardt
git at videolan.org
Wed Jan 27 13:11:03 EET 2021
ffmpeg | branch: master | Andreas Rheinhardt <andreas.rheinhardt at gmail.com> | Tue Jan 26 14:18:11 2021 +0100| [d64d30bd255f96214a6d63c2fdc9f9e66a516eb7] | committer: Andreas Rheinhardt
avformat/avidec: Simplify compile-time check for DV demuxer
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 at xvid.org>
Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt at gmail.com>
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=d64d30bd255f96214a6d63c2fdc9f9e66a516eb7
---
libavformat/avidec.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/libavformat/avidec.c b/libavformat/avidec.c
index e92a449969..79000f3e81 100644
--- a/libavformat/avidec.c
+++ b/libavformat/avidec.c
@@ -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);
More information about the ffmpeg-cvslog
mailing list