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

Merge commit 'e3d0f49a' 


* commit 'e3d0f49a':
  mpegvideo: h263: Move all tables to a single file

Conflicts:
	libavcodec/h263.h
	libavcodec/h263data.h

Merged-by: default avatarMichael Niedermayer <michaelni@gmx.at>
parents 58f63670 e3d0f49a
No related branches found
No related tags found
No related merge requests found
Hide whitespace changes
Inline Side-by-side
Showing
with 326 additions and 279 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