vc1dec: prevent v_edge_pos from becoming negative.

[ffmpeg] / libavcodec / frame_thread_encoder.c

diff --git a/libavcodec/frame_thread_encoder.c b/libavcodec/frame_thread_encoder.c
index 208874c483330b5bb7d07ad9079864e707dc40b5..0ac018b35e7a2ef419429329e8143e4a1f5b21a5 100644 (file)
--- 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;
@@ -225,7 +226,7 @@ int ff_thread_video_encode_frame(AVCodecContext *avctx, AVPacket *pkt, const AVF
             if(!new)
                 return AVERROR(ENOMEM);
             pthread_mutex_lock(&c->buffer_mutex);
-            ret = c->parent_avctx->get_buffer(c->parent_avctx, new);
+            ret = ff_get_buffer(c->parent_avctx, new);
             pthread_mutex_unlock(&c->buffer_mutex);
             if(ret<0)
                 return ret;