diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-05-11 23:28:40 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-05-11 23:28:40 +0200 |
| commit | f2f99f07a5f1f74a91503cc6c3730c06498cee43 (patch) | |
| tree | f8a6fd207cf7c004e53d0f19ffa1ff0b7c25a5f1 /libavcodec/vc1dec.c | |
| parent | d93cf093f840b9a28481c73d7e421f469f2ca4e7 (diff) | |
| parent | 5c1d7246cd65dc4db1b6dc36e29ce39fc1068f3f (diff) | |
| download | ffmpeg-f2f99f07a5f1f74a91503cc6c3730c06498cee43.tar.gz | |
Merge commit '5c1d7246cd65dc4db1b6dc36e29ce39fc1068f3f'
* commit '5c1d7246cd65dc4db1b6dc36e29ce39fc1068f3f':
lavc: set AVCodecContext.hwaccel in ff_get_format()
Conflicts:
libavcodec/mpeg12dec.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/vc1dec.c')
| -rw-r--r-- | libavcodec/vc1dec.c | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/libavcodec/vc1dec.c b/libavcodec/vc1dec.c index be6a3b8a9d..c53c594bbe 100644 --- a/libavcodec/vc1dec.c +++ b/libavcodec/vc1dec.c @@ -5609,7 +5609,6 @@ static av_cold int vc1_decode_init(AVCodecContext *avctx) avctx->pix_fmt = ff_get_format(avctx, avctx->codec->pix_fmts); else avctx->pix_fmt = AV_PIX_FMT_GRAY8; - avctx->hwaccel = ff_find_hwaccel(avctx); v->s.avctx = avctx; if ((ret = ff_vc1_init_common(v)) < 0) |