OSDN Git Service
(root)
/
android-x86
/
external-ffmpeg.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
0fdf410
)
My commit in r11942 broke compilation.
author
Vitor Sessak
<vitor1001@gmail.com>
Fri, 15 Feb 2008 19:47:14 +0000
(19:47 +0000)
committer
Vitor Sessak
<vitor1001@gmail.com>
Fri, 15 Feb 2008 19:47:14 +0000
(19:47 +0000)
This fixes it.
Originally committed as revision 11959 to svn://svn.ffmpeg.org/ffmpeg/trunk
libavcodec/imgconvert.c
patch
|
blob
|
history
diff --git
a/libavcodec/imgconvert.c
b/libavcodec/imgconvert.c
index
04bcc27
..
a6a5d6f
100644
(file)
--- a/
libavcodec/imgconvert.c
+++ b/
libavcodec/imgconvert.c
@@
-608,10
+608,10
@@
int avpicture_fill(AVPicture *picture, uint8_t *ptr,
if(avcodec_check_dimensions(NULL, width, height))
return -1;
- if (
avpicture
_fill_linesize(picture, pix_fmt, width))
+ if (
ff
_fill_linesize(picture, pix_fmt, width))
return -1;
- return
avpicture
_fill_pointer(picture, ptr, pix_fmt, height);
+ return
ff
_fill_pointer(picture, ptr, pix_fmt, height);
}
int avpicture_layout(const AVPicture* src, int pix_fmt, int width, int height,