Skip to content

Commit

Permalink
add "jpg" as a transparent alias for "jpeg"
Browse files Browse the repository at this point in the history
git-svn-id: https://xpra.org/svn/Xpra/trunk@8002 3bb7dfac-3a0b-4e04-842a-767bc560f471
  • Loading branch information
totaam committed Oct 31, 2014
1 parent 86094fc commit 9275160
Showing 1 changed file with 3 additions and 1 deletion.
4 changes: 3 additions & 1 deletion src/xpra/scripts/main.py
Original file line number Diff line number Diff line change
Expand Up @@ -176,15 +176,17 @@ def getlist(strarg, help_txt, all_list):

def fixup_encodings(options):
from xpra.codecs.loader import ALL_OLD_ENCODING_NAMES_TO_NEW, PREFERED_ENCODING_ORDER
RENAME = {"jpg" : "jpeg"}
if options.encoding:
#fix old encoding names if needed:
options.encoding = ALL_OLD_ENCODING_NAMES_TO_NEW.get(options.encoding, options.encoding)
options.encoding = RENAME.get(options.encoding, options.encoding)
estr = _csvstr(options.encodings)
if estr=="all":
#replace with an actual list
options.encodings = PREFERED_ENCODING_ORDER
return
encodings = _nodupes(estr)
encodings = [RENAME.get(x, x) for x in _nodupes(estr)]
if "rgb" in encodings:
if "rgb24" not in encodings:
encodings.append("rgb24")
Expand Down

0 comments on commit 9275160

Please sign in to comment.