[FFmpeg-cvslog] Revert "avcodec/bsf: Forbid packet without payload in av_bsf_send_packet"

James Almer git at videolan.org
Sun Apr 23 04:56:50 EEST 2017


ffmpeg | branch: master | James Almer <jamrial at gmail.com> | Sat Apr 22 21:52:06 2017 -0300| [844a115cd3cd829c894339133685b71e3201dc86] | committer: James Almer

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 at gmail.com>

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=844a115cd3cd829c894339133685b71e3201dc86
---

 libavcodec/avcodec.h | 3 +--
 libavcodec/bsf.c     | 3 ---
 2 files changed, 1 insertion(+), 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);



More information about the ffmpeg-cvslog mailing list