summaryrefslogtreecommitdiffstats
path: root/libmpcodecs/mp_image.c
diff options
context:
space:
mode:
authorUoti Urpala <uau@mplayer2.org>2011-12-10 22:39:43 +0200
committerUoti Urpala <uau@mplayer2.org>2012-03-25 22:30:37 +0300
commit4f1e4eae993a22eff4561c7c05f723f6c9ff94b8 (patch)
tree98ad365a282453b1929450d2d412ea6afa026316 /libmpcodecs/mp_image.c
parentfd50478659e56db84e8564434702cdc8291ac854 (diff)
downloadmpv-4f1e4eae993a22eff4561c7c05f723f6c9ff94b8.tar.bz2
mpv-4f1e4eae993a22eff4561c7c05f723f6c9ff94b8.tar.xz
cosmetics: misc minor cleanups
The deleted ZRM* things were only relevant to vo_zr, which was deleted earlier.
Diffstat (limited to 'libmpcodecs/mp_image.c')
-rw-r--r--libmpcodecs/mp_image.c4
1 files changed, 1 insertions, 3 deletions
diff --git a/libmpcodecs/mp_image.c b/libmpcodecs/mp_image.c
index 4683f41174..45426eb673 100644
--- a/libmpcodecs/mp_image.c
+++ b/libmpcodecs/mp_image.c
@@ -99,9 +99,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 ||
- out_fmt == IMGFMT_ZRMJPEGNI || out_fmt == IMGFMT_ZRMJPEGIT || out_fmt == IMGFMT_ZRMJPEGIB ||
- IMGFMT_IS_HWACCEL(out_fmt)){
+ if(out_fmt == IMGFMT_MPEGPES || IMGFMT_IS_HWACCEL(out_fmt)){
mpi->bpp=0;
return;
}