diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-12-19 02:24:02 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-12-19 02:24:24 +0100 |
| commit | 3f5d1c8130b1326d779c4216886272a3efce816a (patch) | |
| tree | dbdc1343021d1ec4f8662d398e4fb68e4e79e46b /libavformat/rtpenc.c | |
| parent | 03d1467cf85baa996b64667e169c720ac05895e8 (diff) | |
| parent | adc214e6797750285a5e62634b8521db521162ad (diff) | |
| download | android_external_ffmpeg-3f5d1c8130b1326d779c4216886272a3efce816a.tar.gz android_external_ffmpeg-3f5d1c8130b1326d779c4216886272a3efce816a.tar.bz2 android_external_ffmpeg-3f5d1c8130b1326d779c4216886272a3efce816a.zip | |
Merge commit 'adc214e6797750285a5e62634b8521db521162ad'
* commit 'adc214e6797750285a5e62634b8521db521162ad':
rtpenc: Avoid brittle switch fallthroughs
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavformat/rtpenc.c')
| -rw-r--r-- | libavformat/rtpenc.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/libavformat/rtpenc.c b/libavformat/rtpenc.c index 653aeb2922..ef8b33c7cd 100644 --- a/libavformat/rtpenc.c +++ b/libavformat/rtpenc.c @@ -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) { |