diff options
| author | James Stembridge <jstembridge@users.sourceforge.net> | 2003-03-19 22:22:42 +0000 |
|---|---|---|
| committer | James Stembridge <jstembridge@users.sourceforge.net> | 2003-03-19 22:22:42 +0000 |
| commit | ac4ea235062b05c8e46de6bc67392628b107e708 (patch) | |
| tree | 055718ca09bbed95c8b1e7bf69d48e6a42e4e5b4 | |
| parent | 5a7b54026fdabf780fd1243b89732f6e3f6172de (diff) | |
| download | xine-lib-ac4ea235062b05c8e46de6bc67392628b107e708.tar.gz xine-lib-ac4ea235062b05c8e46de6bc67392628b107e708.tar.bz2 | |
fix segfault when ffmpeg returns a frame containing no data, as happens with unsupported mjpeg coding types
CVS patchset: 4451
CVS date: 2003/03/19 22:22:42
| -rw-r--r-- | src/libffmpeg/xine_decoder.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/libffmpeg/xine_decoder.c b/src/libffmpeg/xine_decoder.c index 7fa4137d9..c0edcdedd 100644 --- a/src/libffmpeg/xine_decoder.c +++ b/src/libffmpeg/xine_decoder.c @@ -17,7 +17,7 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA * - * $Id: xine_decoder.c,v 1.103 2003/03/16 15:54:00 jstembridge Exp $ + * $Id: xine_decoder.c,v 1.104 2003/03/19 22:22:42 jstembridge Exp $ * * xine decoder plugin using ffmpeg * @@ -567,7 +567,7 @@ static void ff_decode_data (video_decoder_t *this_gen, buf_element_t *buf) { this->size -= len; offset += len; - if (!got_picture) { + if (!got_picture || !this->av_frame->data[0]) { printf ("ffmpeg: didn't get a picture, got %d bytes left\n", this->size); |