projects
/
ffmpeg.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
(from parent 1:
6781ec6
)
Merge commit 'ac467d94fa6d9d626f77d4ca8125a5eb1ad5425d'
author
Michael Niedermayer
<michaelni@gmx.at>
Fri, 19 Dec 2014 03:43:53 +0000
(
04:43
+0100)
committer
Michael Niedermayer
<michaelni@gmx.at>
Fri, 19 Dec 2014 03:44:08 +0000
(
04:44
+0100)
* commit '
ac467d94fa6d9d626f77d4ca8125a5eb1ad5425d
':
lcl: return an appropriate error code
Merged-by: Michael Niedermayer <michaelni@gmx.at>
libavcodec/lclenc.c
patch
|
blob
|
history
diff --git
a/libavcodec/lclenc.c
b/libavcodec/lclenc.c
index
201d357
..
864adc9
100644
(file)
--- a/
libavcodec/lclenc.c
+++ b/
libavcodec/lclenc.c
@@
-165,7
+165,7
@@
static av_cold int encode_init(AVCodecContext *avctx)
zret = deflateInit(&c->zstream, c->compression);
if (zret != Z_OK) {
av_log(avctx, AV_LOG_ERROR, "Deflate init error: %d\n", zret);
- return
1
;
+ return
AVERROR_UNKNOWN
;
}
return 0;