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

Merge commit '711c9701' 


* commit '711c9701':
  rv34: Check the return value from ff_rv34_decode_init

Conflicts:
	libavcodec/rv30.c
	libavcodec/rv40.c

See: b86651a2
Merged-by: default avatarMichael Niedermayer <michaelni@gmx.at>
parents 2c8d876d 711c9701
No related branches found
No related tags found
Hide whitespace changes
Inline Side-by-side
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