← Back to branch summary

~ubuntu-branches/ubuntu/precise/ffmpeg-debian/precise

« back to all changes in this revision

Viewing changes to libavformat/wv.c

  • Committer: Bazaar Package Importer
  • Author(s): Reinhard Tartler
  • Date: 2009-01-20 09:20:53 UTC
  • mfrom: (1.1.3 upstream)
  • Revision ID: james.westby@ubuntu.com-20090120092053-izz63p40hc98qfgp
Tags: 3:0.svn20090119-1ubuntu1
https://launchpad.net/bugs/318501
https://launchpad.net/bugs/253767
* merge from debian. LP: #318501
* new version fixes CVE-2008-3230, LP: #253767

Show diffs side-by-side

added added

removed removed

Lines of Context:
libavformat/wv.c
19
19
 * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
20
20
 */
21
21
 
22
 
#include "libavutil/bswap.h"
 
22
#include "libavutil/intreadwrite.h"
23
23
#include "avformat.h"
24
24
 
25
25
// specs say that maximum block size is 1Mb
100
100
        av_log(ctx, AV_LOG_ERROR, "Floating point data is not supported\n");
101
101
        return -1;
102
102
    }
103
 
    if(wc->flags & WV_HYBRID){
104
 
        av_log(ctx, AV_LOG_ERROR, "Hybrid coding mode is not supported\n");
105
 
        return -1;
106
 
    }
107
103
 
108
104
    bpp = ((wc->flags & 3) + 1) << 3;
109
105
    chan = 1 + !(wc->flags & WV_MONO);