]> git.sesse.net Git - ffmpeg/commitdiff
simplify
authorMichael Niedermayer <michaelni@gmx.at>
Sat, 24 Jun 2006 09:57:28 +0000 (09:57 +0000)
committerMichael Niedermayer <michaelni@gmx.at>
Sat, 24 Jun 2006 09:57:28 +0000 (09:57 +0000)
Originally committed as revision 5513 to svn://svn.ffmpeg.org/ffmpeg/trunk

ffmpeg.c

index 888319121e4b0c41108145ce9b51d72e84b56f52..717262e265211b76ceee112a7735e394a952e3fa 100644 (file)
--- 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;