avformat/utils: Remove demuxer specific frame_size fallback from ff_get_audio_frame_s...
authorMichael Niedermayer <michaelni@gmx.at>
Thu, 14 Aug 2014 00:34:57 +0000 (02:34 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Thu, 14 Aug 2014 00:39:59 +0000 (02:39 +0200)
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
libavformat/utils.c

index 5bb5642..f995c4f 100644 (file)
@@ -719,10 +719,6 @@ int ff_get_audio_frame_size(AVCodecContext *enc, int size, int mux)
 {
     int frame_size;
 
-    /* give frame_size priority if demuxing */
-    if (!mux && enc->frame_size > 1)
-        return enc->frame_size;
-
     if ((frame_size = av_get_audio_frame_duration(enc, size)) > 0)
         return frame_size;