Skip to content

F
ffmpeg
Commit 03853b10 authored by Michael Niedermayer's avatar Michael Niedermayer
Browse files
Options

Merge commit 'f1cb490d' 

* commit 'f1cb490d':
  xl: Fix the buffer size check

Conflicts:
	libavcodec/xl.c

See: 8c59e0c3Merged-by: 's avatarMichael Niedermayer <michaelni@gmx.at>
parents 688331c5 f1cb490d
Hide whitespace changes
Inline Side-by-side
Showing with 0 additions and 0 deletions
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment