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

Merge commit 'bfe5454cd238b16e7977085f880205229103eccb'

Browse Source 
* commit 'bfe5454cd238b16e7977085f880205229103eccb':
  lavf: move ff_codec_get_tag() and ff_codec_get_id() definitions to internal.h
  lavf: move "MP3 " fourcc from riff to nut
  fate: vpx: Add dependencies
  fate: Fix wavpack-matroskamode test dependencies
  x86: dsputilenc: port to cpuflags

Conflicts:
	libavformat/internal.h
	libavformat/nut.c
	tests/fate/vpx.mak

Merged-by: Michael Niedermayer <michaelni@gmx.at>
This commit is contained in:
Michael Niedermayer
2012-11-29 13:45:57 +01:00
parent 7dc0ed80e8 bfe5454cd2
commit 076300bf8b
23 changed files with 91 additions and 97 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
libavformat/swf.h
View File

@@ -32,7 +32,7 @@
#include "libavutil/fifo.h"
#include "avformat.h"
#include "avio.h"
#include "riff.h" /* for CodecTag */
#include "internal.h"
/* should have a generic way to indicate probable size */
#define DUMMY_FILE_SIZE (100 * 1024 * 1024)