Merge commit '9f1eccb9'

* commit '9f1eccb9':
  ff_parse_specific_params: do not use AVCodecContext.frame_size
Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>

libavformat/riffenc.c

@@ -242,12 +242,7 @@ void ff_parse_specific_params(AVStream *st, int *au_rate,
     int gcd;
     int audio_frame_size;
 
-    /* We use the known constant frame size for the codec if known, otherwise
-     * fall back on using AVCodecContext.frame_size, which is not as reliable
-     * for indicating packet duration. */
     audio_frame_size = av_get_audio_frame_duration(codec, 0);
-    if (!audio_frame_size)
-        audio_frame_size = codec->frame_size;
 
     *au_ssize = codec->block_align;
     if (audio_frame_size && codec->sample_rate) {