diff options
| author | Roman Shaposhnik <roman@shaposhnik.org> | 2003-08-12 18:20:29 +0000 |
|---|---|---|
| committer | Roman Shaposhnik <roman@shaposhnik.org> | 2003-08-12 18:20:29 +0000 |
| commit | 36b58e850dec536b7dce5f9358744025e84d6ef9 (patch) | |
| tree | dee3cfcf92f33839f725bf9244066e8c1f56dd13 /libavcodec/mpeg12.c | |
| parent | bdb2e37c4aca0ee92b6b642ca76ddfd79c255553 (diff) | |
| download | ffmpeg-36b58e850dec536b7dce5f9358744025e84d6ef9.tar.gz | |
* fixing a regression in mpeg encoder (not setting pix_fmt),
this is hardly the right way to do things, but it'll suffice for now.
* patch from Gildas Bazin
gbazin at altern dot org
* fix for a 10l in configure
* gcc 2.95.3 and Solaris build in general are not ready
for -Werror in libavformat/Makefile
Originally committed as revision 2123 to svn://svn.ffmpeg.org/ffmpeg/trunk
Diffstat (limited to 'libavcodec/mpeg12.c')
| -rw-r--r-- | libavcodec/mpeg12.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/libavcodec/mpeg12.c b/libavcodec/mpeg12.c index f15b336d2b..c9884d321b 100644 --- a/libavcodec/mpeg12.c +++ b/libavcodec/mpeg12.c @@ -2035,7 +2035,7 @@ static int slice_end(AVCodecContext *avctx, AVFrame *pict) Mpeg1Context *s1 = avctx->priv_data; MpegEncContext *s = &s1->mpeg_enc_ctx; - if (!s1->mpeg_enc_ctx_allocated) + if (!s1->mpeg_enc_ctx_allocated || !s->current_picture_ptr) return 0; #ifdef HAVE_XVMC |