Stowage/ffmpeg
2
0
Fork 0
mirror of https://git.ffmpeg.org/ffmpeg.git synced 2025-12-08 06:09:50 +00:00
Code Issues Projects Releases Packages Wiki Activity

Merge commit 'cd832f032f'

Browse source 
* commit 'cd832f032f':
  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
commit daded4f89a
3 changed files with 2 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

2
libavcodec/ffv1.c
View file

@ -54,8 +54,6 @@ av_cold int ffv1_common_init(AVCodecContext *avctx)
if (!s->picture.f || !s->last_picture.f)
return AVERROR(ENOMEM);
ff_dsputil_init(&s->dsp, avctx);
s->width = avctx->width;
s->height = avctx->height;