[FFmpeg-cvslog] avcodec/h2645_parse: skip NALUs with no content after stripping all the trailing zeros

[James Almer]

ffmpeg | branch: release/4.0 | James Almer <jamrial at gmail.com> | Mon May 14 18:09:32 2018 -0300| [967604fecf042ff11474315538d3258c8f7b49b2] | committer: Aman Gupta

avcodec/h2645_parse: skip NALUs with no content after stripping all the trailing zeros

The GetBitContext is effectively empty in them.

Signed-off-by: James Almer <jamrial at gmail.com>
(cherry picked from commit 9a09f4c54ab829811c2dd041cfb7196000590b78)

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

 libavcodec/h2645_parse.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/libavcodec/h2645_parse.c b/libavcodec/h2645_parse.c
index e6c40381b0..f35c02d1bd 100644
--- a/libavcodec/h2645_parse.c
+++ b/libavcodec/h2645_parse.c
@@ -371,7 +371,7 @@ int ff_h2645_packet_split(H2645Packet *pkt, const uint8_t *buf, int length,
             ret = hevc_parse_nal_header(nal, logctx);
         else
             ret = h264_parse_nal_header(nal, logctx);
-        if (ret <= 0 || nal->size <= 0) {
+        if (ret <= 0 || nal->size <= 0 || nal->size_bits <= 0) {
             if (ret < 0) {
                 av_log(logctx, AV_LOG_ERROR, "Invalid NAL unit %d, skipping.\n",
                        nal->type);