aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPhilip Gladstone <philipjsg@users.sourceforge.net>2002-12-09 02:53:55 +0000
committerPhilip Gladstone <philipjsg@users.sourceforge.net>2002-12-09 02:53:55 +0000
commitf694168d524d1c84f5f20f4260fcab1f4d8c11d7 (patch)
tree820bc3a369ddb64348753fb98dd0b6a3289a3df1
parent4e00e76b3cf20eff69d8c86a5376bf0a12d3f6d4 (diff)
downloadffmpeg-f694168d524d1c84f5f20f4260fcab1f4d8c11d7.tar.gz
Fix a crash caused by a null coded_picture pointer in ffserver.
Originally committed as revision 1326 to svn://svn.ffmpeg.org/ffmpeg/trunk
-rw-r--r--libavformat/ffm.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/libavformat/ffm.c b/libavformat/ffm.c
index cd7a174d06..2f247e422e 100644
--- a/libavformat/ffm.c
+++ b/libavformat/ffm.c
@@ -232,7 +232,7 @@ static int ffm_write_packet(AVFormatContext *s, int stream_index,
/* packet size & key_frame */
header[0] = stream_index;
header[1] = 0;
- if (st->codec.coded_picture->key_frame)
+ if (st->codec.coded_picture && st->codec.coded_picture->key_frame)
header[1] |= FLAG_KEY_FRAME;
header[2] = (size >> 16) & 0xff;
header[3] = (size >> 8) & 0xff;