[FFmpeg-cvslog] libschroedingerenc: do not assert on values from external libraries
Alexandra Khirnova
git at videolan.org
Sat Nov 23 15:00:10 CET 2013
ffmpeg | branch: master | Alexandra Khirnova <alexandra.khirnova at gmail.com> | Thu Nov 21 22:06:31 2013 +0100| [6f270da61b8c9a2dc71f48ae2a21e046d7f15b69] | committer: Anton Khirnov
libschroedingerenc: do not assert on values from external libraries
Signed-off-by: Anton Khirnov <anton at khirnov.net>
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=6f270da61b8c9a2dc71f48ae2a21e046d7f15b69
---
libavcodec/libschroedingerenc.c | 7 ++-----
1 file changed, 2 insertions(+), 5 deletions(-)
diff --git a/libavcodec/libschroedingerenc.c b/libavcodec/libschroedingerenc.c
index 11cc0eb..d53d846 100644
--- a/libavcodec/libschroedingerenc.c
+++ b/libavcodec/libschroedingerenc.c
@@ -27,9 +27,6 @@
* (http://dirac.sourceforge.net/specification.html).
*/
-#undef NDEBUG
-#include <assert.h>
-
#include <schroedinger/schro.h>
#include <schroedinger/schrodebug.h>
#include <schroedinger/schrovideoformat.h>
@@ -301,8 +298,8 @@ static int libschroedinger_encode_frame(AVCodecContext *avctx, AVPacket *pkt,
case SCHRO_STATE_HAVE_BUFFER:
case SCHRO_STATE_END_OF_STREAM:
enc_buf = schro_encoder_pull(encoder, &presentation_frame);
- assert(enc_buf->length > 0);
- assert(enc_buf->length <= buf_size);
+ if (enc_buf->length <= 0)
+ return AVERROR_BUG;
parse_code = enc_buf->data[4];
/* All non-frame data is prepended to actual frame data to
More information about the ffmpeg-cvslog
mailing list