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

Merge commit 'fe06795d' 


* commit 'fe06795d':
  vc1: implement frame interlaced b-frame header parsing

Conflicts:
	libavcodec/vc1.c

Merged-by: default avatarMichael Niedermayer <michaelni@gmx.at>
parents b602e47f fe06795d
No related branches found
No related tags found
No related merge requests found
Hide whitespace changes
Inline Side-by-side
Showing
with 2 additions and 1 deletion
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