[SCM] libav/experimental: simplify

[siretart at users.alioth.debian.org]

The following commit has been merged in the experimental branch:
commit e943369fd4b7a6f7fd1320145fb6e373d9119955
Author: Baptiste Coudurier <baptiste.coudurier at gmail.com>
Date:   Fri Jan 5 14:23:13 2007 +0000

    simplify
    
    Originally committed as revision 7409 to svn://svn.ffmpeg.org/ffmpeg/trunk

diff --git a/libavformat/swf.c b/libavformat/swf.c
index caadc9d..b4f6fd1 100644
--- a/libavformat/swf.c
+++ b/libavformat/swf.c
@@ -831,10 +831,7 @@ static int swf_read_header(AVFormatContext *s, AVFormatParameters *ap)
                     return -ENOMEM;
                 av_set_pts_info(ast, 24, 1, 1000); /* 24 bit pts in ms */
 
-                if (v & 0x01)
-                    ast->codec->channels = 2;
-                else
-                    ast->codec->channels = 1;
+                ast->codec->channels = 1 + (v&1);
 
                 switch((v>> 2) & 0x03) {
                 case 1:

-- 
Libav/FFmpeg packaging