← Back to branch summary

~medibuntu-maintainers/mplayer/medibuntu.precise

« back to all changes in this revision

Viewing changes to ffmpeg/libavcodec/imgconvert.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/imgconvert.c
42
42
#include "x86/dsputil_mmx.h"
43
43
#endif
44
44
 
45
 
#define xglue(x, y) x ## y
46
 
#define glue(x, y) xglue(x, y)
47
 
 
48
45
#define FF_COLOR_RGB      0 /**< RGB color space */
49
46
#define FF_COLOR_GRAY     1 /**< gray color space */
50
47
#define FF_COLOR_YUV      2 /**< YUV color space. 16 <= Y <= 235, 16 <= U, V <= 240 */
865
862
    return 0;
866
863
}
867
864
 
 
865
#if FF_API_GET_ALPHA_INFO
868
866
/* NOTE: we scan all the pixels to have an exact information */
869
867
static int get_alpha_info_pal8(const AVPicture *src, int width, int height)
870
868
{
911
909
    }
912
910
    return ret;
913
911
}
 
912
#endif
914
913
 
915
914
#if !(HAVE_MMX && HAVE_YASM)
916
915
/* filter parameters: [-1 4 2 4 -1] // 8 */
1001
1000
    uint8_t *src_m1, *src_0, *src_p1, *src_p2;
1002
1001
    int y;
1003
1002
    uint8_t *buf;
1004
 
    buf = (uint8_t*)av_malloc(width);
 
1003
    buf = av_malloc(width);
1005
1004
 
1006
1005
    src_m1 = src1;
1007
1006
    memcpy(buf,src_m1,width);