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

Merge commit '67fc8a15' 


* commit '67fc8a15':
  theora: support different visible and coded frame size

Conflicts:
	libavcodec/vp3.c

Merged-by: default avatarMichael Niedermayer <michaelni@gmx.at>
parents 3e889713 67fc8a15
No related branches found
No related tags found
No related merge requests found
Hide whitespace changes
Inline Side-by-side
Showing
with 45 additions and 16 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