diff options
author | James Almer <jamrial@gmail.com> | 2017-04-23 03:52:06 +0300 |
---|---|---|
committer | James Almer <jamrial@gmail.com> | 2017-04-23 03:52:06 +0300 |
commit | 844a115cd3cd829c894339133685b71e3201dc86 (patch) | |
tree | 281f4d63bf30dcb60823f859730bc1c43f093c66 /libavcodec | |
parent | 3148387086ade31af214a72aa1610e2d8f68f0a0 (diff) |
Revert "avcodec/bsf: Forbid packet without payload in av_bsf_send_packet"
This reverts commit bfdca87ab55c7f69087d962dc47aa45c8c6436fb.
Packets with no data or side data will be valid EOF signal in an
upcoming merge.
Signed-off-by: James Almer <jamrial@gmail.com>
Diffstat (limited to 'libavcodec')
-rw-r--r-- | libavcodec/avcodec.h | 3 | ||||
-rw-r--r-- | libavcodec/bsf.c | 3 |
2 files changed, 1 insertions, 5 deletions
diff --git a/libavcodec/avcodec.h b/libavcodec/avcodec.h index 95c65a6f78..3463870aa2 100644 --- a/libavcodec/avcodec.h +++ b/libavcodec/avcodec.h @@ -6039,8 +6039,7 @@ int av_bsf_init(AVBSFContext *ctx); * av_bsf_receive_packet() repeatedly until it returns AVERROR(EAGAIN) or * AVERROR_EOF. * - * @param pkt the packet to filter. pkt must contain some payload (i.e data or - * side data must be present in pkt). The bitstream filter will take ownership of + * @param pkt the packet to filter. The bitstream filter will take ownership of * the packet and reset the contents of pkt. pkt is not touched if an error occurs. * This parameter may be NULL, which signals the end of the stream (i.e. no more * packets will be sent). That will cause the filter to output any packets it diff --git a/libavcodec/bsf.c b/libavcodec/bsf.c index c984526e14..0f97c259cb 100644 --- a/libavcodec/bsf.c +++ b/libavcodec/bsf.c @@ -21,7 +21,6 @@ #include "libavutil/log.h" #include "libavutil/mem.h" #include "libavutil/opt.h" -#include "libavutil/avassert.h" #include "libavutil/avstring.h" #include "libavutil/bprint.h" @@ -180,8 +179,6 @@ int av_bsf_send_packet(AVBSFContext *ctx, AVPacket *pkt) return 0; } - av_assert0(pkt->data || pkt->side_data); - if (ctx->internal->eof) { av_log(ctx, AV_LOG_ERROR, "A non-NULL packet sent after an EOF.\n"); return AVERROR(EINVAL); |