← Back to branch summary

~ubuntu-branches/ubuntu/utopic/libav/utopic-proposed

« back to all changes in this revision

Viewing changes to libavcodec/wmv2dec.c

  • Committer: Package Import Robot
  • Author(s): Reinhard Tartler, Reinhard Tartler, Rico Tzschichholz
  • Date: 2014-08-30 11:02:45 UTC
  • mfrom: (1.3.47 sid)
  • Revision ID: package-import@ubuntu.com-20140830110245-io3dg7q85wfr7125
Tags: 6:11~beta1-2
[ Reinhard Tartler ]
* Make libavcodec-dev depend on libavresample-dev

[ Rico Tzschichholz ]
* Some fixes and leftovers from soname bumps

Show diffs side-by-side

added added

removed removed

Lines of Context:
libavcodec/wmv2dec.c
19
19
 */
20
20
 
21
21
#include "avcodec.h"
 
22
#include "mpegutils.h"
22
23
#include "mpegvideo.h"
23
24
#include "h263.h"
24
25
#include "mathops.h"
384
385
        wmv2_pred_motion(w, &mx, &my);
385
386
 
386
387
        if(cbp){
387
 
            s->dsp.clear_blocks(s->block[0]);
 
388
            s->bdsp.clear_blocks(s->block[0]);
388
389
            if(s->per_mb_rl_table){
389
390
                s->rl_table_index = decode012(&s->gb);
390
391
                s->rl_chroma_table_index = s->rl_table_index;
430
431
            s->rl_chroma_table_index = s->rl_table_index;
431
432
        }
432
433
 
433
 
        s->dsp.clear_blocks(s->block[0]);
 
434
        s->bdsp.clear_blocks(s->block[0]);
434
435
        for (i = 0; i < 6; i++) {
435
436
            if (ff_msmpeg4_decode_block(s, block[i], i, (cbp >> (5 - i)) & 1, NULL) < 0)
436
437
            {
474
475
    .close          = wmv2_decode_end,
475
476
    .decode         = ff_h263_decode_frame,
476
477
    .capabilities   = CODEC_CAP_DRAW_HORIZ_BAND | CODEC_CAP_DR1,
477
 
    .pix_fmts       = ff_pixfmt_list_420,
 
478
    .pix_fmts       = (const enum AVPixelFormat[]) {
 
479
        AV_PIX_FMT_YUV420P,
 
480
        AV_PIX_FMT_NONE
 
481
    },
478
482
};