generic-library/ffmpeg
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge commit 'd04c17c91363a6b15d1ac2d79c817f3d5e2998b3'

Browse Source 
* commit 'd04c17c91363a6b15d1ac2d79c817f3d5e2998b3':
  swfdec: cosmetics: fix indentation

Merged-by: Michael Niedermayer <michaelni@gmx.at>
This commit is contained in:
Michael Niedermayer
2012-12-12 10:16:19 +01:00
parent d276f28b7d d04c17c913
commit 8dbc384f15
1 changed files with 16 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

32
libavformat/swfdec.c
View File

@@ -399,22 +399,22 @@ bitmap_end_skip:
for (i = 0; i < s->nb_streams; i++) { for (i = 0; i < s->nb_streams; i++) {
st = s->streams[i]; st = s->streams[i];
if (st->codec->codec_type == AVMEDIA_TYPE_AUDIO && st->id == -1) { if (st->codec->codec_type == AVMEDIA_TYPE_AUDIO && st->id == -1) {
if (st->codec->codec_id == AV_CODEC_ID_MP3) { if (st->codec->codec_id == AV_CODEC_ID_MP3) {
avio_skip(pb, 4); avio_skip(pb, 4);
len -= 4; len -= 4;
if (len <= 0) if (len <= 0)
goto skip; goto skip;
if ((res = av_get_packet(pb, pkt, len)) < 0) if ((res = av_get_packet(pb, pkt, len)) < 0)
return res; return res;
} else { // ADPCM, PCM } else { // ADPCM, PCM
if (len <= 0) if (len <= 0)
goto skip; goto skip;
if ((res = av_get_packet(pb, pkt, len)) < 0) if ((res = av_get_packet(pb, pkt, len)) < 0)
return res; return res;
} }
pkt->pos = pos; pkt->pos = pos;
pkt->stream_index = st->index; pkt->stream_index = st->index;
return pkt->size; return pkt->size;
} }
} }
} else if (tag == TAG_JPEG2) { } else if (tag == TAG_JPEG2) {