diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-11-23 14:53:39 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-11-23 14:53:39 +0100 |
| commit | f63ee2aa14ec1b018a2b78a8f543a71a9b51f9e0 (patch) | |
| tree | e9c639f1380d8e5ea67d6e1772024e84e2d5b076 | |
| parent | 3e641b4842b8b5f6592991479d19f1a7ce846308 (diff) | |
| parent | 6f270da61b8c9a2dc71f48ae2a21e046d7f15b69 (diff) | |
| download | ffmpeg-f63ee2aa14ec1b018a2b78a8f543a71a9b51f9e0.tar.gz | |
Merge remote-tracking branch 'qatar/master'
* qatar/master:
libschroedingerenc: do not assert on values from external libraries
Conflicts:
libavcodec/libschroedingerenc.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
| -rw-r--r-- | libavcodec/libschroedingerenc.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/libavcodec/libschroedingerenc.c b/libavcodec/libschroedingerenc.c index f3455df1f3..777d7c5044 100644 --- a/libavcodec/libschroedingerenc.c +++ b/libavcodec/libschroedingerenc.c @@ -299,7 +299,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); - av_assert0(enc_buf->length > 0); + 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 |