← Back to branch summary

~medibuntu-maintainers/mplayer/medibuntu.precise

« back to all changes in this revision

Viewing changes to ffmpeg/libavcodec/dirac.c

  • Committer: Package Import Robot
  • Author(s): Reinhard Tartler
  • Date: 2012-01-12 22:23:28 UTC
  • mfrom: (0.4.7 sid)
  • mto: This revision was merged to the branch mainline in revision 76.
  • Revision ID: package-import@ubuntu.com-20120112222328-8jqdyodym3p84ygu
Tags: 2:1.0~rc4.dfsg1+svn34540-1
* New upstream snapshot
* upload to unstable

Show diffs side-by-side

added added

removed removed

Lines of Context:
ffmpeg/libavcodec/dirac.c
145
145
    }
146
146
    if (source->frame_rate_index > 0) {
147
147
        if (source->frame_rate_index <= 8)
148
 
            frame_rate = ff_frame_rate_tab[source->frame_rate_index];
 
148
            frame_rate = avpriv_frame_rate_tab[source->frame_rate_index];
149
149
        else
150
150
            frame_rate = dirac_frame_rate[source->frame_rate_index-9];
151
151
    }
242
242
    return 0;
243
243
}
244
244
 
245
 
int ff_dirac_parse_sequence_header(AVCodecContext *avctx, GetBitContext *gb,
 
245
int avpriv_dirac_parse_sequence_header(AVCodecContext *avctx, GetBitContext *gb,
246
246
                                   dirac_source_params *source)
247
247
{
248
248
    unsigned version_major;