summaryrefslogtreecommitdiff
path: root/libavformat
diff options
context:
space:
mode:
authorEli Friedman <eli.friedman@gmail.com>2010-06-28 08:04:52 +0000
committerMartin Storsjö <martin@martin.st>2010-06-28 08:04:52 +0000
commit22d78b05b1c80ab739704dbb013c34077d32207b (patch)
treec1ebf45c97c7269f72d339eb3afabaf0481c7eb4 /libavformat
parent35614edb2dad6684917539bd1f61bd5ea1e8e19d (diff)
Fix an "assignment from incompatible pointer type" warning in av_read_frame_internal
Patch by Eli Friedman, eli dot friedman at gmail Originally committed as revision 23842 to svn://svn.ffmpeg.org/ffmpeg/trunk
Diffstat (limited to 'libavformat')
-rw-r--r--libavformat/utils.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/libavformat/utils.c b/libavformat/utils.c
index efbf4e4a0e..4ab18bba1a 100644
--- a/libavformat/utils.c
+++ b/libavformat/utils.c
@@ -1077,7 +1077,7 @@ static int av_read_frame_internal(AVFormatContext *s, AVPacket *pkt)
if(pkt->data == st->cur_pkt.data && pkt->size == st->cur_pkt.size){
s->cur_st = NULL;
pkt->destruct= st->cur_pkt.destruct;
- st->cur_pkt.destruct=
+ st->cur_pkt.destruct= NULL;
st->cur_pkt.data = NULL;
assert(st->cur_len == 0);
}else{