ffmpeg | branch: master | Himangi Saraogi <himangi...@gmail.com> | Thu Mar 12 22:08:13 2015 +0530| [913aa9a4874418724183a3ec862cdc63b829367d] | committer: Luca Barbato
libx264: Return more meaningful error codes Signed-off-by: Luca Barbato <lu_z...@gentoo.org> > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=913aa9a4874418724183a3ec862cdc63b829367d --- libavcodec/libx264.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/libavcodec/libx264.c b/libavcodec/libx264.c index 6388b6c..6e707a8 100644 --- a/libavcodec/libx264.c +++ b/libavcodec/libx264.c @@ -235,11 +235,11 @@ static int X264_frame(AVCodecContext *ctx, AVPacket *pkt, const AVFrame *frame, } do { if (x264_encoder_encode(x4->enc, &nal, &nnal, frame? &x4->pic: NULL, &pic_out) < 0) - return -1; + return AVERROR_UNKNOWN; ret = encode_nals(ctx, pkt, nal, nnal); if (ret < 0) - return -1; + return ret; } while (!ret && !frame && x264_encoder_delayed_frames(x4->enc)); pkt->pts = pic_out.i_pts; @@ -518,7 +518,7 @@ static av_cold int X264_init(AVCodecContext *avctx) x4->enc = x264_encoder_open(&x4->params); if (!x4->enc) - return -1; + return AVERROR_UNKNOWN; avctx->coded_frame = av_frame_alloc(); if (!avctx->coded_frame) _______________________________________________ ffmpeg-cvslog mailing list ffmpeg-cvslog@ffmpeg.org http://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog
