From 986ec3417abd2f77a4ee88ab9cb86d91556729d8 Mon Sep 17 00:00:00 2001 From: Michael Niedermayer Date: Thu, 14 Aug 2014 02:34:57 +0200 Subject: [PATCH] avformat/utils: Remove demuxer specific frame_size fallback from ff_get_audio_frame_size() Signed-off-by: Michael Niedermayer --- libavformat/utils.c | 4 ---- 1 file changed, 4 deletions(-) diff --git a/libavformat/utils.c b/libavformat/utils.c index 5bb56428f0..f995c4f7a5 100644 --- a/libavformat/utils.c +++ b/libavformat/utils.c @@ -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;