diff options
| author | wm4 <wm4@nowhere> | 2012-10-24 22:38:45 +0200 |
|---|---|---|
| committer | wm4 <wm4@nowhere> | 2012-10-24 22:38:45 +0200 |
| commit | 0e81d62c53a205ce5a4a5b201c283a1f9aba7316 (patch) | |
| tree | 9ce8f4b0444a765c6a5dce3cb84c528a0e4ca3df /libmpcodecs/mp_image.c | |
| parent | bcf447d7e82af814ccc07c852543be38e58d69c8 (diff) | |
| parent | 60cbc9461b86b13c68cc9537bc9a124ddc07a399 (diff) | |
| download | mpv-0e81d62c53a205ce5a4a5b201c283a1f9aba7316.tar.bz2 mpv-0e81d62c53a205ce5a4a5b201c283a1f9aba7316.tar.xz | |
Merge branch 'master' into osd_changes
Conflicts:
libvo/vo_xv.c
Diffstat (limited to 'libmpcodecs/mp_image.c')
| -rw-r--r-- | libmpcodecs/mp_image.c | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/libmpcodecs/mp_image.c b/libmpcodecs/mp_image.c index f01e416b01..b7c9017188 100644 --- a/libmpcodecs/mp_image.c +++ b/libmpcodecs/mp_image.c @@ -120,7 +120,7 @@ void mp_image_setfmt(mp_image_t* mpi,unsigned int out_fmt){ mpi->flags&=~(MP_IMGFLAG_PLANAR|MP_IMGFLAG_YUV|MP_IMGFLAG_SWAPPED); mpi->imgfmt=out_fmt; // compressed formats - if(out_fmt == IMGFMT_MPEGPES || IMGFMT_IS_HWACCEL(out_fmt)){ + if(IMGFMT_IS_HWACCEL(out_fmt)){ mpi->bpp=0; return; } @@ -140,6 +140,11 @@ void mp_image_setfmt(mp_image_t* mpi,unsigned int out_fmt){ mpi->flags|=MP_IMGFLAG_SWAPPED; return; } + switch (out_fmt) { + case IMGFMT_BGR0: + mpi->bpp = 32; + return; + } mpi->num_planes=3; if (out_fmt == IMGFMT_GBRP) { mpi->bpp=24; |