← Back to branch summary

~siretart/libav/merge.raring.libav-0.8.6

« back to all changes in this revision

Viewing changes to libavcodec/libschroedinger.c

  • Committer: Package Import Robot
  • Author(s): Reinhard Tartler
  • Date: 2012-01-12 22:30:00 UTC
  • mfrom: (1.4.1)
  • mto: (1.3.11 sid) (26.1.1 quantal-security)
  • mto: This revision was merged to the branch mainline in revision 15.
  • Revision ID: package-import@ubuntu.com-20120112223000-s1reiy1e28hnix42
Tags: upstream-0.8~beta2
Import upstream version 0.8~beta2

Show diffs side-by-side

added added

removed removed

Lines of Context:
libavcodec/libschroedinger.c
20
20
 
21
21
/**
22
22
* @file
23
 
* function definitions common to libschroedingerdec.c and libschroedingerenc.c
 
23
* function definitions common to libschroedinger decoder and encoder
24
24
*/
25
25
 
26
26
#include "libdirac_libschro.h"
64
64
int ff_get_schro_frame_format (SchroChromaFormat schro_pix_fmt,
65
65
                               SchroFrameFormat  *schro_frame_fmt)
66
66
{
67
 
    unsigned int num_formats = sizeof(ffmpeg_schro_pixel_format_map) /
68
 
                               sizeof(ffmpeg_schro_pixel_format_map[0]);
 
67
    unsigned int num_formats = sizeof(schro_pixel_format_map) /
 
68
                               sizeof(schro_pixel_format_map[0]);
69
69
 
70
70
    int idx;
71
71
 
72
72
    for (idx = 0; idx < num_formats; ++idx) {
73
 
        if (ffmpeg_schro_pixel_format_map[idx].schro_pix_fmt == schro_pix_fmt) {
74
 
            *schro_frame_fmt = ffmpeg_schro_pixel_format_map[idx].schro_frame_fmt;
 
73
        if (schro_pixel_format_map[idx].schro_pix_fmt == schro_pix_fmt) {
 
74
            *schro_frame_fmt = schro_pixel_format_map[idx].schro_frame_fmt;
75
75
            return 0;
76
76
        }
77
77
    }