Mercurial > libavformat.hg
comparison swf.c @ 482:0fdc96c2f2fe libavformat
sweeping change from -EIO -> AVERROR_IO
| author | melanson |
|---|---|
| date | Sat, 19 Jun 2004 03:59:34 +0000 |
| parents | 60f897e8dd2d |
| children | 59ddf98a5c65 |
comparison
equal
deleted
inserted
replaced
| 481:f1430abbbd8b | 482:0fdc96c2f2fe |
|---|---|
| 793 if (!swf) | 793 if (!swf) |
| 794 return -1; | 794 return -1; |
| 795 s->priv_data = swf; | 795 s->priv_data = swf; |
| 796 | 796 |
| 797 if ((get_be32(pb) & 0xffffff00) != MKBETAG('F', 'W', 'S', 0)) | 797 if ((get_be32(pb) & 0xffffff00) != MKBETAG('F', 'W', 'S', 0)) |
| 798 return -EIO; | 798 return AVERROR_IO; |
| 799 get_le32(pb); | 799 get_le32(pb); |
| 800 /* skip rectangle size */ | 800 /* skip rectangle size */ |
| 801 nbits = get_byte(pb) >> 3; | 801 nbits = get_byte(pb) >> 3; |
| 802 len = (4 * nbits - 3 + 7) / 8; | 802 len = (4 * nbits - 3 + 7) / 8; |
| 803 url_fskip(pb, len); | 803 url_fskip(pb, len); |
| 821 vst->codec.frame_rate_base = 1; | 821 vst->codec.frame_rate_base = 1; |
| 822 } | 822 } |
| 823 break; | 823 break; |
| 824 } | 824 } |
| 825 av_log(s, AV_LOG_ERROR, "No media found in SWF\n"); | 825 av_log(s, AV_LOG_ERROR, "No media found in SWF\n"); |
| 826 return -EIO; | 826 return AVERROR_IO; |
| 827 } | 827 } |
| 828 if ( tag == TAG_VIDEOSTREAM && !vst) { | 828 if ( tag == TAG_VIDEOSTREAM && !vst) { |
| 829 swf->ch_id = get_le16(pb); | 829 swf->ch_id = get_le16(pb); |
| 830 get_le16(pb); | 830 get_le16(pb); |
| 831 get_le16(pb); | 831 get_le16(pb); |
| 875 case 3: | 875 case 3: |
| 876 ast->codec.sample_rate = 44100; | 876 ast->codec.sample_rate = 44100; |
| 877 break; | 877 break; |
| 878 default: | 878 default: |
| 879 av_free(ast); | 879 av_free(ast); |
| 880 return -EIO; | 880 return AVERROR_IO; |
| 881 } | 881 } |
| 882 ast->codec.codec_type = CODEC_TYPE_AUDIO; | 882 ast->codec.codec_type = CODEC_TYPE_AUDIO; |
| 883 ast->codec.codec_id = CODEC_ID_MP3; | 883 ast->codec.codec_id = CODEC_ID_MP3; |
| 884 } | 884 } |
| 885 } else { | 885 } else { |
| 899 int tag, len, i, frame; | 899 int tag, len, i, frame; |
| 900 | 900 |
| 901 for(;;) { | 901 for(;;) { |
| 902 tag = get_swf_tag(pb, &len); | 902 tag = get_swf_tag(pb, &len); |
| 903 if (tag < 0) | 903 if (tag < 0) |
| 904 return -EIO; | 904 return AVERROR_IO; |
| 905 if (tag == TAG_VIDEOFRAME) { | 905 if (tag == TAG_VIDEOFRAME) { |
| 906 for( i=0; i<s->nb_streams; i++ ) { | 906 for( i=0; i<s->nb_streams; i++ ) { |
| 907 st = s->streams[i]; | 907 st = s->streams[i]; |
| 908 if (st->id == 0) { | 908 if (st->id == 0) { |
| 909 if ( get_le16(pb) == swf->ch_id ) { | 909 if ( get_le16(pb) == swf->ch_id ) { |