virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2025-07-16 22:42:38 +02:00
Code Issues Releases Activity

Merge commit 'cd832f032f945a57a1f1dd385942c2fadc7ce4e5'

Browse Source 
* commit 'cd832f032f945a57a1f1dd385942c2fadc7ce4e5':
  ffv1: Drop bogus dependency on dsputil

Conflicts:
	configure
	libavcodec/ffv1.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
This commit is contained in:
Michael Niedermayer
2014-03-13 21:26:49 +01:00
parent 981aa02338 cd832f032f
commit daded4f89a
3 changed files with 2 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
libavcodec/ffv1.h
View File

@ -35,7 +35,6 @@
#include "libavutil/pixdesc.h"
#include "libavutil/timer.h"
#include "avcodec.h"
#include "dsputil.h"
#include "get_bits.h"
#include "internal.h"
#include "mathops.h"
@ -116,8 +115,6 @@ typedef struct FFV1Context {
int gob_count;
int quant_table_count;
DSPContext dsp;
struct FFV1Context *slice_context[MAX_SLICES];
int slice_count;
int num_v_slices;