Merge commit 'e3d0f49abb20a551bf6d885f75c354d6d0bbeb9d'
* commit 'e3d0f49abb20a551bf6d885f75c354d6d0bbeb9d': mpegvideo: h263: Move all tables to a single file Conflicts: libavcodec/h263.h libavcodec/h263data.h Merged-by: Michael Niedermayer <michaelni@gmx.at>
This commit is contained in:
@@ -32,6 +32,7 @@
|
||||
#include "avcodec.h"
|
||||
#include "error_resilience.h"
|
||||
#include "h263.h"
|
||||
#include "h263data.h"
|
||||
#include "internal.h"
|
||||
#include "mpeg_er.h"
|
||||
#include "mpegutils.h"
|
||||
|
Reference in New Issue
Block a user