generic-library/ffmpeg
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge commit 'e0c16e4e3259cf50b5bac4c23bb6e517f397c74b'

Browse Source 
* commit 'e0c16e4e3259cf50b5bac4c23bb6e517f397c74b':
  mpegvideo: move mpegvideo formats-related defines to mpegutils.h

Conflicts:
	libavcodec/h264_cabac.c
	libavcodec/h264_cavlc.c
	libavcodec/h264_mvpred.h
	libavcodec/svq1enc.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
This commit is contained in:
Michael Niedermayer
2014-03-17 12:33:33 +01:00
parent 3e5833802e e0c16e4e32
commit 9517900bef
42 changed files with 157 additions and 80 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
libavcodec/h263.c
View File

@@ -34,6 +34,7 @@
#include "h263.h"
#include "h263data.h"
#include "mathops.h"
#include "mpegutils.h"
#include "unary.h"
#include "flv.h"
#include "mpeg4video.h"