diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-08-14 02:34:57 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-08-14 02:39:59 +0200 |
| commit | 986ec3417abd2f77a4ee88ab9cb86d91556729d8 (patch) | |
| tree | bd86277094ea9a7836ec90a8a5d4226a235945ef /libavformat | |
| parent | 1d7544b752e73c4c554caca3dfc22ba23050f879 (diff) | |
| download | ffmpeg-986ec3417abd2f77a4ee88ab9cb86d91556729d8.tar.gz | |
avformat/utils: Remove demuxer specific frame_size fallback from ff_get_audio_frame_size()
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavformat')
| -rw-r--r-- | libavformat/utils.c | 4 |
1 files changed, 0 insertions, 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; |