aboutsummaryrefslogtreecommitdiffstats
path: root/libavcodec/frame_thread_encoder.c
diff options
context:
space:
mode:
authorMichael Niedermayer <michaelni@gmx.at>2012-11-08 18:25:24 +0100
committerMichael Niedermayer <michaelni@gmx.at>2012-11-08 18:25:24 +0100
commit3affcc99a831b896d75c390f9546f3d54b5fa10d (patch)
treebc43275084dd9998f751973e70bbc46981e221df /libavcodec/frame_thread_encoder.c
parent5ff43ec72dac5ec3b0a7fc07c12d1152daadf15f (diff)
downloadffmpeg-3affcc99a831b896d75c390f9546f3d54b5fa10d.tar.gz
frame_thread_encoder: silence integer to pointer without cast warning
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/frame_thread_encoder.c')
-rw-r--r--libavcodec/frame_thread_encoder.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/libavcodec/frame_thread_encoder.c b/libavcodec/frame_thread_encoder.c
index 208874c483..ab095dc98e 100644
--- a/libavcodec/frame_thread_encoder.c
+++ b/libavcodec/frame_thread_encoder.c
@@ -98,7 +98,8 @@ static void * attribute_align_arg worker(void *v){
if(got_packet) {
av_dup_packet(pkt);
} else {
- pkt->data = pkt->size = 0;
+ pkt->data = NULL;
+ pkt->size = 0;
}
pthread_mutex_lock(&c->finished_task_mutex);
c->finished_tasks[task.index].outdata = pkt; pkt = NULL;