Merge commit 'adc214e6797750285a5e62634b8521db521162ad'

* commit 'adc214e6797750285a5e62634b8521db521162ad':
  rtpenc: Avoid brittle switch fallthroughs

Merged-by: Michael Niedermayer <michaelni@gmx.at>
This commit is contained in:
Michael Niedermayer 2014-12-19 02:24:02 +01:00
commit 3f5d1c8130

View File

@ -259,8 +259,11 @@ static int rtp_write_header(AVFormatContext *s1)
av_log(s1, AV_LOG_ERROR, "Only mono is supported\n");
goto fail;
}
s->num_frames = 0;
goto defaultcase;
case AV_CODEC_ID_AAC:
s->num_frames = 0;
goto defaultcase;
default:
defaultcase:
if (st->codec->codec_type == AVMEDIA_TYPE_AUDIO) {