[FFmpeg-cvslog] Move frame_size fallback from ff_get_audio_frame_size() to av_get_audio_frame_duration()

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Thu Aug 14 02:42:14 2014 +0200| [ed488d1535d9e7b729dda2a6ffe8ecff481dad83] | committer: Michael Niedermayer

Move frame_size fallback from ff_get_audio_frame_size() to av_get_audio_frame_duration()

Signed-off-by: Michael Niedermayer <michaelni at gmx.at>

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=ed488d1535d9e7b729dda2a6ffe8ecff481dad83
---

 libavcodec/utils.c  |    4 ++++
 libavformat/utils.c |    4 ----
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/libavcodec/utils.c b/libavcodec/utils.c
index de371e8..4531311 100644
--- a/libavcodec/utils.c
+++ b/libavcodec/utils.c
@@ -3306,6 +3306,10 @@ int av_get_audio_frame_duration(AVCodecContext *avctx, int frame_bytes)
         }
     }
 
+    /* Fall back on using frame_size */
+    if (avctx->frame_size > 1 && frame_bytes)
+        return avctx->frame_size;
+
     return 0;
 }
 
diff --git a/libavformat/utils.c b/libavformat/utils.c
index f995c4f..c695e37 100644
--- a/libavformat/utils.c
+++ b/libavformat/utils.c
@@ -722,10 +722,6 @@ int ff_get_audio_frame_size(AVCodecContext *enc, int size, int mux)
     if ((frame_size = av_get_audio_frame_duration(enc, size)) > 0)
         return frame_size;
 
-    /* Fall back on using frame_size if muxing. */
-    if (enc->frame_size > 1)
-        return enc->frame_size;
-
     //For WMA we currently have no other means to calculate duration thus we
     //do it here by assuming CBR, which is true for all known cases.
     if (!mux && enc->bit_rate>0 && size>0 && enc->sample_rate>0 && enc->block_align>1) {