git.videolan.org
/
ffmpeg.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Remove the dependency of libswscale on img_format.h
[ffmpeg.git]
/
libswscale
/
yuv2rgb_template.c
diff --git
a/libswscale/yuv2rgb_template.c
b/libswscale/yuv2rgb_template.c
index
2f15931
..
fd22235
100644
(file)
--- a/
libswscale/yuv2rgb_template.c
+++ b/
libswscale/yuv2rgb_template.c
@@
-127,7
+127,7
@@
static inline int RENAME(yuv420_rgb16)(SwsContext *c, uint8_t* src[], int srcStr
int srcSliceH, uint8_t* dst[], int dstStride[]){
int y, h_size;
int srcSliceH, uint8_t* dst[], int dstStride[]){
int y, h_size;
- if(c->srcFormat ==
IMGFMT_
422P){
+ if(c->srcFormat ==
PIX_FMT_YUV
422P){
srcStride[1] *= 2;
srcStride[2] *= 2;
}
srcStride[1] *= 2;
srcStride[2] *= 2;
}
@@
-222,7
+222,7
@@
static inline int RENAME(yuv420_rgb15)(SwsContext *c, uint8_t* src[], int srcStr
int srcSliceH, uint8_t* dst[], int dstStride[]){
int y, h_size;
int srcSliceH, uint8_t* dst[], int dstStride[]){
int y, h_size;
- if(c->srcFormat ==
IMGFMT_
422P){
+ if(c->srcFormat ==
PIX_FMT_YUV
422P){
srcStride[1] *= 2;
srcStride[2] *= 2;
}
srcStride[1] *= 2;
srcStride[2] *= 2;
}
@@
-311,7
+311,7
@@
static inline int RENAME(yuv420_rgb24)(SwsContext *c, uint8_t* src[], int srcStr
int srcSliceH, uint8_t* dst[], int dstStride[]){
int y, h_size;
int srcSliceH, uint8_t* dst[], int dstStride[]){
int y, h_size;
- if(c->srcFormat ==
IMGFMT_
422P){
+ if(c->srcFormat ==
PIX_FMT_YUV
422P){
srcStride[1] *= 2;
srcStride[2] *= 2;
}
srcStride[1] *= 2;
srcStride[2] *= 2;
}
@@
-457,7
+457,7
@@
static inline int RENAME(yuv420_rgb32)(SwsContext *c, uint8_t* src[], int srcStr
int srcSliceH, uint8_t* dst[], int dstStride[]){
int y, h_size;
int srcSliceH, uint8_t* dst[], int dstStride[]){
int y, h_size;
- if(c->srcFormat ==
IMGFMT_
422P){
+ if(c->srcFormat ==
PIX_FMT_YUV
422P){
srcStride[1] *= 2;
srcStride[2] *= 2;
}
srcStride[1] *= 2;
srcStride[2] *= 2;
}