[SCM] libav/experimental: ffserver: do not use intreadwrite.h

[siretart at users.alioth.debian.org]

The following commit has been merged in the experimental branch:
commit acd0026c0b7ee0f73339ab3b71b34b3b513ee0de
Author: Måns Rullgård <mans at mansr.com>
Date:   Sun Mar 7 22:18:30 2010 +0000

    ffserver: do not use intreadwrite.h
    
    intreadwrite.h is not part of the public API and should thus
    not be used by the ff* applications.
    
    Originally committed as revision 22293 to svn://svn.ffmpeg.org/ffmpeg/trunk

diff --git a/ffserver.c b/ffserver.c
index 3563468..41081c3 100644
--- a/ffserver.c
+++ b/ffserver.c
@@ -37,7 +37,6 @@
 #include "libavutil/avstring.h"
 #include "libavutil/lfg.h"
 #include "libavutil/random_seed.h"
-#include "libavutil/intreadwrite.h"
 #include "libavcodec/opt.h"
 #include <stdarg.h>
 #include <unistd.h>
@@ -4255,7 +4254,7 @@ static int parse_ffconfig(const char *filename)
         } else if (!strcasecmp(cmd, "VideoTag")) {
             get_arg(arg, sizeof(arg), &p);
             if ((strlen(arg) == 4) && stream)
-                video_enc.codec_tag = AV_RL32(arg);
+                video_enc.codec_tag = MKTAG(arg[0], arg[1], arg[2], arg[3]);
         } else if (!strcasecmp(cmd, "BitExact")) {
             if (stream)
                 video_enc.flags |= CODEC_FLAG_BITEXACT;

-- 
Libav/FFmpeg packaging