← Back to branch summary

~ubuntu-branches/ubuntu/saucy/gst-libav1.0/saucy-proposed

« back to all changes in this revision

Viewing changes to gst-libs/ext/libav/libavformat/avs.c

  • Committer: Package Import Robot
  • Author(s): Sebastian Dröge
  • Date: 2013-07-30 09:00:15 UTC
  • mfrom: (1.1.16) (7.1.7 experimental)
  • Revision ID: package-import@ubuntu.com-20130730090015-sc1ou2yssu7q5w4e
Tags: 1.1.3-1
* New upstream development snapshot:
  + debian/control:
    - Build depend on GStreamer and gst-plugins-base >= 1.1.3.

Show diffs side-by-side

added added

removed removed

Lines of Context:
gst-libs/ext/libav/libavformat/avs.c
55
55
    return 0;
56
56
}
57
57
 
58
 
static int avs_read_header(AVFormatContext * s, AVFormatParameters * ap)
 
58
static int avs_read_header(AVFormatContext * s)
59
59
{
60
60
    AvsFormat *avs = s->priv_data;
61
61
 
124
124
    int ret, size;
125
125
 
126
126
    size = avio_tell(s->pb);
127
 
    ret = voc_get_packet(s, pkt, avs->st_audio, avs->remaining_audio_size);
 
127
    ret = ff_voc_get_packet(s, pkt, avs->st_audio, avs->remaining_audio_size);
128
128
    size = avio_tell(s->pb) - size;
129
129
    avs->remaining_audio_size -= size;
130
130
 
183
183
                    if (avs->st_video == NULL)
184
184
                        return AVERROR(ENOMEM);
185
185
                    avs->st_video->codec->codec_type = AVMEDIA_TYPE_VIDEO;
186
 
                    avs->st_video->codec->codec_id = CODEC_ID_AVS;
 
186
                    avs->st_video->codec->codec_id = AV_CODEC_ID_AVS;
187
187
                    avs->st_video->codec->width = avs->width;
188
188
                    avs->st_video->codec->height = avs->height;
189
189
                    avs->st_video->codec->bits_per_coded_sample=avs->bits_per_sample;
190
190
                    avs->st_video->nb_frames = avs->nb_frames;
191
 
                    avs->st_video->codec->time_base = (AVRational) {
192
 
                    1, avs->fps};
 
191
#if FF_API_R_FRAME_RATE
 
192
                    avs->st_video->r_frame_rate =
 
193
#endif
 
194
                    avs->st_video->avg_frame_rate = (AVRational){avs->fps, 1};
193
195
                }
194
196
                return avs_read_video_packet(s, pkt, type, sub_type, size,
195
197
                                             palette, palette_size);
221
223
 
222
224
AVInputFormat ff_avs_demuxer = {
223
225
    .name           = "avs",
224
 
    .long_name      = NULL_IF_CONFIG_SMALL("AVS format"),
 
226
    .long_name      = NULL_IF_CONFIG_SMALL("AVS"),
225
227
    .priv_data_size = sizeof(AvsFormat),
226
228
    .read_probe     = avs_probe,
227
229
    .read_header    = avs_read_header,