Skip to content

Commit

Permalink
#640: just always store the format as a string and avoid encode() on …
Browse files Browse the repository at this point in the history
…the way out

git-svn-id: https://xpra.org/svn/Xpra/trunk@9068 3bb7dfac-3a0b-4e04-842a-767bc560f471
  • Loading branch information
totaam committed Apr 20, 2015
1 parent 31102a7 commit 99e101e
Showing 1 changed file with 3 additions and 2 deletions.
5 changes: 3 additions & 2 deletions src/xpra/codecs/vpx/decoder.pyx
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@
import os
from xpra.codecs.codec_constants import codec_spec, get_subsampling_divs
from xpra.codecs.image_wrapper import ImageWrapper
from xpra.os_util import bytestostr

from xpra.log import Logger
log = Logger("decoder", "vpx")
Expand Down Expand Up @@ -208,7 +209,7 @@ cdef class Decoder:
cdef int flags = 0
cdef const vpx_codec_iface_t *codec_iface = make_codec_dx(encoding)
self.encoding = encoding
self.dst_format = colorspace
self.dst_format = bytestostr(colorspace)
self.pixfmt = get_vpx_colorspace(self.dst_format)
self.width = width
self.height = height
Expand Down Expand Up @@ -241,7 +242,7 @@ cdef class Decoder:
}

def get_colorspace(self):
return self.dst_format.decode()
return self.dst_format

def get_width(self):
return self.width
Expand Down

0 comments on commit 99e101e

Please sign in to comment.