| Message ID | 20210126132127.1802120-1-andreas.rheinhardt@gmail.com |
|---|---|
| State | Accepted |
| Commit | d64d30bd255f96214a6d63c2fdc9f9e66a516eb7 |
| Headers | show |
| Series | [FFmpeg-devel] avformat/avidec: Simplify compile-time check for DV demuxer | expand |
| Context | Check | Description |
|---|---|---|
| andriy/x86_make | success | Make finished |
| andriy/x86_make_fate | success | Make fate finished |
| andriy/PPC64_make | success | Make finished |
| andriy/PPC64_make_fate | success | Make fate finished |
On Tue, Jan 26, 2021 at 02:21:27PM +0100, Andreas Rheinhardt wrote: > 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. > > Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt@gmail.com> > --- > 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); > -- > 2.25.1 ok -- Peter (A907 E02F A6E5 0CD2 34CD 20D2 6760 79C5 AC40 DD6B)
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);
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. Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt@gmail.com> --- libavformat/avidec.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)