Merge commit '6ed38b1f65b424a4fa92042e0069f350b95e0098'

Browse Source

* commit '6ed38b1f65b424a4fa92042e0069f350b95e0098':
  tiff: Return more meaningful error codes

Conflicts:
	libavcodec/tiffenc.c

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

pull/127/head

Michael Niedermayer 10 years ago

parent 98263d7515 6ed38b1f65

commit 847c0d333b

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