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

Merge commit 'df903683'


* commit 'df903683':
  truemotion2: return meaningful error codes.
  tscc: remove some pointless comments and empty lines.
  tscc: return meaningful error codes.
  loco: cosmetics, reformat

Conflicts:
	libavcodec/truemotion2.c
	libavcodec/tscc.c

Merged-by: default avatarMichael Niedermayer <michaelni@gmx.at>
parents f9d5bdd0 df903683
No related branches found
No related tags found
No related merge requests found
Loading
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment