Merge commit '6d78e852fbf3cab438a2085bcb64b90457c4a851'

Browse Source

* commit '6d78e852fbf3cab438a2085bcb64b90457c4a851':
  img2: add j2c file extension

Conflicts:
	libavformat/img2enc.c

See: e8df18270a
Merged-by: Michael Niedermayer <michaelni@gmx.at>

pull/293/head

Michael Niedermayer 11 years ago

parent c738ffcf2c 6d78e852fb

commit ba7cdb970f

Whitespace

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Split View

Diff Options

Show Stats Download Patch File Download Diff File

Diff Content Not Available