git.videolan.org
/
ffmpeg.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
31ec694
)
swr: correctly raise rematrix AVERROR.
author
Clément Bœsch
<ubitux@gmail.com>
Thu, 17 Nov 2011 10:20:50 +0000
(11:20 +0100)
committer
Clément Bœsch
<ubitux@gmail.com>
Thu, 17 Nov 2011 16:56:52 +0000
(17:56 +0100)
libswresample/swresample.c
patch
|
blob
|
history
diff --git
a/libswresample/swresample.c
b/libswresample/swresample.c
index
2e8020d
..
6c6482a
100644
(file)
--- a/
libswresample/swresample.c
+++ b/
libswresample/swresample.c
@@
-239,8
+239,8
@@
av_assert0(s->out.ch_count);
s->in_buffer.planar = s->postin.planar = s->midbuf.planar = s->preout.planar = 1;
- if(s->rematrix
&& swri_rematrix_init(s)<0
)
- return
-1
;
+ if(s->rematrix)
+ return
swri_rematrix_init(s)
;
return 0;
}