[SCM] libav/upstream: Merge branch 'upstream' of ssh://git.debian.org/git/pkg-multimedia/libav into upstream

[siretart at users.alioth.debian.org]

Imported Upstream version 0.8.8
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
X-Git-Refname: refs/heads/upstream
X-Git-Reftype: branch
X-Git-Oldrev: 9a88bd4bbd77c5b55809b1c77f264a81ba2523e1
X-Git-Newrev: 6289eb495d3b0946808efbac2bbff24f68bc9b64

The following commit has been merged in the upstream branch:
commit 6289eb495d3b0946808efbac2bbff24f68bc9b64
Merge: e15d6651021ec64e9a229a1c78781702cfe06904 9a88bd4bbd77c5b55809b1c77f264a81ba2523e1
Author: Reinhard Tartler <siretart at tauware.de>
Date:   Tue Aug 13 18:41:57 2013 +0200

    Merge branch 'upstream' of ssh://git.debian.org/git/pkg-multimedia/libav into upstream
    
    Conflicts:
    	Changelog
    	RELEASE
    	VERSION
    	libavcodec/4xm.c
    	libavcodec/dv.c
    	libavcodec/get_bits.h
    	libavcodec/ivi_common.c
    	libavcodec/kmvc.c
    	libavcodec/mjpegdec.c
    	libavcodec/tiff.c
    	libavcodec/vmdav.c
    	libavcodec/wavpack.c
    	libavcodec/wmaprodec.c


-- 
Libav/FFmpeg packaging