Merge commit '430d12196432ded13f011a3bf7690f03c9b2e5d6'

Browse Source

* commit '430d12196432ded13f011a3bf7690f03c9b2e5d6':
  pcx: round up in bits->bytes conversion in a buffer size check

Conflicts:
	libavcodec/pcx.c

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

pull/49/head

Michael Niedermayer 11 years ago

parent bdf831859f 430d121964

commit 8617be28d0

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