aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMichael Niedermayer <michaelni@gmx.at>2006-06-24 09:57:28 +0000
committerMichael Niedermayer <michaelni@gmx.at>2006-06-24 09:57:28 +0000
commit9e0db7d5aae31739b5814c5b9df764856a363de8 (patch)
treeecf45045c418295bc030fec097b69fd7ce08b2d4
parentcef7cc72321670a37b758cb9a3382ddf609876aa (diff)
downloadffmpeg-9e0db7d5aae31739b5814c5b9df764856a363de8.tar.gz
simplify
Originally committed as revision 5513 to svn://svn.ffmpeg.org/ffmpeg/trunk
-rw-r--r--ffmpeg.c6
1 files changed, 2 insertions, 4 deletions
diff --git a/ffmpeg.c b/ffmpeg.c
index 888319121e..717262e265 100644
--- a/ffmpeg.c
+++ b/ffmpeg.c
@@ -1375,10 +1375,8 @@ static int output_packet(AVInputStream *ist, int ist_index,
ret = avcodec_encode_audio(enc, bit_buffer, bit_buffer_size, samples);
}
enc->frame_size = fs_tmp;
- if(ret <= 0) {
- ret = avcodec_encode_audio(enc, bit_buffer, bit_buffer_size, NULL);
- }
- } else {
+ }
+ if(ret <= 0) {
ret = avcodec_encode_audio(enc, bit_buffer, bit_buffer_size, NULL);
}
audio_size += ret;