diff options
| author | Andreas Rheinhardt <andreas.rheinhardt@gmail.com> | 2020-04-19 21:18:51 +0200 |
|---|---|---|
| committer | Andreas Rheinhardt <andreas.rheinhardt@gmail.com> | 2020-04-20 18:25:02 +0200 |
| commit | ee593bff984bed20a35e2a98119d82a1bcf6d3bd (patch) | |
| tree | 63de89d94b880d2d1dbe17560fa5a30e9fcc7059 | |
| parent | 4e254ec6be86977d9ea173f1769398f153bd1d28 (diff) | |
| download | ffmpeg-ee593bff984bed20a35e2a98119d82a1bcf6d3bd.tar.gz | |
avcodec/bsf: Use macro for "packet is empty"
Reviewed-by: Anton Khirnov <anton@khirnov.net>
Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt@gmail.com>
| -rw-r--r-- | libavcodec/bsf.c | 13 |
1 files changed, 6 insertions, 7 deletions
diff --git a/libavcodec/bsf.c b/libavcodec/bsf.c index b9fc771a88..68fee82e0d 100644 --- a/libavcodec/bsf.c +++ b/libavcodec/bsf.c @@ -28,6 +28,8 @@ #include "avcodec.h" #include "bsf.h" +#define IS_EMPTY(pkt) (!(pkt)->data && !(pkt)->side_data_elems) + struct AVBSFInternal { AVPacket *buffer_pkt; int eof; @@ -195,7 +197,7 @@ int av_bsf_send_packet(AVBSFContext *ctx, AVPacket *pkt) AVBSFInternal *bsfi = ctx->internal; int ret; - if (!pkt || (!pkt->data && !pkt->side_data_elems)) { + if (!pkt || IS_EMPTY(pkt)) { bsfi->eof = 1; return 0; } @@ -205,8 +207,7 @@ int av_bsf_send_packet(AVBSFContext *ctx, AVPacket *pkt) return AVERROR(EINVAL); } - if (bsfi->buffer_pkt->data || - bsfi->buffer_pkt->side_data_elems) + if (!IS_EMPTY(bsfi->buffer_pkt)) return AVERROR(EAGAIN); ret = av_packet_make_refcounted(pkt); @@ -230,8 +231,7 @@ int ff_bsf_get_packet(AVBSFContext *ctx, AVPacket **pkt) if (bsfi->eof) return AVERROR_EOF; - if (!bsfi->buffer_pkt->data && - !bsfi->buffer_pkt->side_data_elems) + if (IS_EMPTY(bsfi->buffer_pkt)) return AVERROR(EAGAIN); tmp_pkt = av_packet_alloc(); @@ -251,8 +251,7 @@ int ff_bsf_get_packet_ref(AVBSFContext *ctx, AVPacket *pkt) if (bsfi->eof) return AVERROR_EOF; - if (!bsfi->buffer_pkt->data && - !bsfi->buffer_pkt->side_data_elems) + if (IS_EMPTY(bsfi->buffer_pkt)) return AVERROR(EAGAIN); av_packet_move_ref(pkt, bsfi->buffer_pkt); |