diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2012-12-12 10:16:19 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2012-12-12 10:16:23 +0100 |
| commit | 8dbc384f1527446b07eb6a673101f765e67f3eca (patch) | |
| tree | fe9a7126f4c05060aade27aef436f8414c05f28d /libavformat/swfdec.c | |
| parent | d276f28b7d0d7980c709edb9807c50f186aa9300 (diff) | |
| parent | d04c17c91363a6b15d1ac2d79c817f3d5e2998b3 (diff) | |
| download | android_external_ffmpeg-8dbc384f1527446b07eb6a673101f765e67f3eca.tar.gz android_external_ffmpeg-8dbc384f1527446b07eb6a673101f765e67f3eca.tar.bz2 android_external_ffmpeg-8dbc384f1527446b07eb6a673101f765e67f3eca.zip | |
Merge commit 'd04c17c91363a6b15d1ac2d79c817f3d5e2998b3'
* commit 'd04c17c91363a6b15d1ac2d79c817f3d5e2998b3':
swfdec: cosmetics: fix indentation
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavformat/swfdec.c')
| -rw-r--r-- | libavformat/swfdec.c | 32 |
1 files changed, 16 insertions, 16 deletions
diff --git a/libavformat/swfdec.c b/libavformat/swfdec.c index cf7e194284..8fb4aeb37a 100644 --- a/libavformat/swfdec.c +++ b/libavformat/swfdec.c @@ -399,22 +399,22 @@ bitmap_end_skip: for (i = 0; i < s->nb_streams; i++) { st = s->streams[i]; if (st->codec->codec_type == AVMEDIA_TYPE_AUDIO && st->id == -1) { - if (st->codec->codec_id == AV_CODEC_ID_MP3) { - avio_skip(pb, 4); - len -= 4; - if (len <= 0) - goto skip; - if ((res = av_get_packet(pb, pkt, len)) < 0) - return res; - } else { // ADPCM, PCM - if (len <= 0) - goto skip; - if ((res = av_get_packet(pb, pkt, len)) < 0) - return res; - } - pkt->pos = pos; - pkt->stream_index = st->index; - return pkt->size; + if (st->codec->codec_id == AV_CODEC_ID_MP3) { + avio_skip(pb, 4); + len -= 4; + if (len <= 0) + goto skip; + if ((res = av_get_packet(pb, pkt, len)) < 0) + return res; + } else { // ADPCM, PCM + if (len <= 0) + goto skip; + if ((res = av_get_packet(pb, pkt, len)) < 0) + return res; + } + pkt->pos = pos; + pkt->stream_index = st->index; + return pkt->size; } } } else if (tag == TAG_JPEG2) { |