Skip to content

F
ffmpeg
Commit 074b89f1 authored by Michael Niedermayer's avatar Michael Niedermayer
Browse files
Options

Merge commit 'a7b87ca9' 

* commit 'a7b87ca9':
  libxavs: rename and fix a variable name

Conflicts:
	libavcodec/libxavs.c

See: 260fc0d9Merged-by: 's avatarMichael Niedermayer <michaelni@gmx.at>
parents f0f75dfa a7b87ca9
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