Skip to content
Snippets Groups Projects
Commit 074b89f1 authored by Michael Niedermayer's avatar Michael Niedermayer
Browse files

Merge commit 'a7b87ca9' 


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

Conflicts:
	libavcodec/libxavs.c

See: 260fc0d9
Merged-by: default avatarMichael Niedermayer <michaelni@gmx.at>
parents f0f75dfa a7b87ca9
Branches
Tags
No related merge requests found
Hide whitespace changes
Inline Side-by-side
Showing
No files found.
with 0 additions and 0 deletions
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment