huffyuv: do not decode/encode yuv colorspace with odd width

[ffmpeg] / libavcodec / libxvid_rc.c

diff --git a/libavcodec/libxvid_rc.c b/libavcodec/libxvid_rc.c
index 8a2b487122a768bd9ec39191e5d5fca7f55baabb..d65e4f2676baea27208811e0cd791c3df5265764 100644 (file)
--- a/libavcodec/libxvid_rc.c
+++ b/libavcodec/libxvid_rc.c
@@ -48,7 +48,7 @@ int ff_xvid_rate_control_init(MpegEncContext *s){
     }
 
     for(i=0; i<s->rc_context.num_entries; i++){
-        static const char *frame_types = " ipbs";
+        static const char frame_types[] = " ipbs";
         char tmp[256];
         RateControlEntry *rce;
 
@@ -59,7 +59,10 @@ int ff_xvid_rate_control_init(MpegEncContext *s){
             rce->skip_count, (rce->i_tex_bits + rce->p_tex_bits + rce->misc_bits+7)/8, (rce->header_bits+rce->mv_bits+7)/8);
 
 //av_log(NULL, AV_LOG_ERROR, "%s\n", tmp);
-        write(fd, tmp, strlen(tmp));
+        if (write(fd, tmp, strlen(tmp)) < 0) {
+            av_log(NULL, AV_LOG_ERROR, "Error %s writing 2pass logfile\n", strerror(errno));
+            return AVERROR(errno);
+        }
     }
 
     close(fd);
@@ -146,4 +149,3 @@ void ff_xvid_rate_control_uninit(MpegEncContext *s){
 
     xvid_plugin_2pass2(s->rc_context.non_lavc_opaque, XVID_PLG_DESTROY, &xvid_plg_destroy, NULL);
 }
-