Skip to content

F
ffmpeg.wasm-core
Commit fa0319b4 authored by Justin Ruggles's avatar Justin Ruggles
Browse files
Options

avcodec: refactor avcodec_encode_audio2() to merge common branches

parent b461cd4d
Hide whitespace changes
Inline Side-by-side
Showing with 3 additions and 3 deletions
libavcodec/utils.c
View file @ fa0319b4
...@@ -885,8 +885,9 @@ int attribute_align_arg avcodec_encode_audio2(AVCodecContext *avctx, ...@@ -885,8 +885,9 @@ int attribute_align_arg avcodec_encode_audio2(AVCodecContext *avctx,
} }
} }
ret = avctx->codec->encode2(avctx, avpkt, frame, got_packet_ptr); ret = avctx->codec->encode2(avctx, avpkt, frame, got_packet_ptr);
if (!ret && *got_packet_ptr) { if (!ret) {
if (*got_packet_ptr) {
if (!(avctx->codec->capabilities & CODEC_CAP_DELAY)) { if (!(avctx->codec->capabilities & CODEC_CAP_DELAY)) {
if (avpkt->pts == AV_NOPTS_VALUE) if (avpkt->pts == AV_NOPTS_VALUE)
avpkt->pts = frame->pts; avpkt->pts = frame->pts;
...@@ -899,7 +900,6 @@ int attribute_align_arg avcodec_encode_audio2(AVCodecContext *avctx, ...@@ -899,7 +900,6 @@ int attribute_align_arg avcodec_encode_audio2(AVCodecContext *avctx,
avpkt->size = 0; avpkt->size = 0;
} }
if (!ret) {
if (!user_packet && avpkt->size) { if (!user_packet && avpkt->size) {
uint8_t *new_data = av_realloc(avpkt->data, avpkt->size); uint8_t *new_data = av_realloc(avpkt->data, avpkt->size);
if (new_data) if (new_data)
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment