diff options
| author | Wim Taymans <wim.taymans@collabora.co.uk> | 2012-02-17 23:49:21 +0100 |
|---|---|---|
| committer | Wim Taymans <wim.taymans@collabora.co.uk> | 2012-02-17 23:49:21 +0100 |
| commit | 82a43ad1ab6d206822259aa23335a791370bb97f (patch) | |
| tree | 0e5bdcb464504827e81f5b4c014e2067aaecff0d /gst/audioparsers | |
| parent | fdfe4ed445ee4df20675abe0289fee6817bef4e1 (diff) | |
| parent | f76f7374ea2227b8422aa6c3b1e084fff0180d0a (diff) | |
Merge branch 'master' into 0.11
Conflicts:
gst/equalizer/gstiirequalizer.c
Diffstat (limited to 'gst/audioparsers')
| -rw-r--r-- | gst/audioparsers/gstmpegaudioparse.c | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/gst/audioparsers/gstmpegaudioparse.c b/gst/audioparsers/gstmpegaudioparse.c index 1cc9f64e20..7566c03d32 100644 --- a/gst/audioparsers/gstmpegaudioparse.c +++ b/gst/audioparsers/gstmpegaudioparse.c @@ -855,9 +855,7 @@ gst_mpeg_audio_parse_handle_first_frame (GstMpegAudioParse * mp3parse, GST_DEBUG_OBJECT (mp3parse, "Encoder delay %u, encoder padding %u", encoder_delay, encoder_padding); } - } - - if (read_id_vbri == vbri_id) { + } else if (read_id_vbri == vbri_id) { gint64 total_bytes, total_frames; GstClockTime total_time; guint16 nseek_points; |