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

Merge commit '9745f19f' 


* commit '9745f19f':
  assdec: check the right variable

Conflicts:
	libavcodec/assdec.c

See: cc7342f7
Merged-by: default avatarMichael Niedermayer <michaelni@gmx.at>
parents 5387b0cb 9745f19f
No related branches found
No related tags 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.
Finish editing this message first!
Please register or to comment