virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2025-08-10 06:10:52 +02:00
Code Issues Releases Activity

avcodec/mlpenc: stop returning packets with no data

Browse Source
This commit is contained in:
Paul B Mahol
2021-09-05 11:36:50 +02:00
parent 589cd58c85
commit 036d94da43
1 changed files with 11 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
libavcodec/mlpenc.c
View File

@@ -1178,7 +1178,7 @@ static void write_frame_headers(MLPEncodeContext *ctx, uint8_t *frame_header,
} }
/** Writes an entire access unit to the bitstream. */ /** Writes an entire access unit to the bitstream. */
static unsigned int write_access_unit(MLPEncodeContext *ctx, uint8_t *buf, static int write_access_unit(MLPEncodeContext *ctx, uint8_t *buf,
int buf_size, int restart_frame) int buf_size, int restart_frame)
{ {
uint16_t substream_data_len[MAX_SUBSTREAMS]; uint16_t substream_data_len[MAX_SUBSTREAMS];
@@ -2183,7 +2183,7 @@ static int mlp_encode_frame(AVCodecContext *avctx, AVPacket *avpkt,
const AVFrame *frame, int *got_packet) const AVFrame *frame, int *got_packet)
{ {
MLPEncodeContext *ctx = avctx->priv_data; MLPEncodeContext *ctx = avctx->priv_data;
unsigned int bytes_written = 0; int bytes_written = 0;
int restart_frame, ret; int restart_frame, ret;
uint8_t *data; uint8_t *data;
@@ -2316,8 +2316,14 @@ no_data_left:
} }
if (!frame) if (!frame)
avctx->frame_number++; avctx->frame_number++;
if (bytes_written > 0) {
avpkt->size = bytes_written; avpkt->size = bytes_written;
*got_packet = 1; *got_packet = 1;
} else {
*got_packet = 0;
}
return 0; return 0;
} }