diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-11-10 20:37:51 +0400 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-11-10 20:37:51 +0400 |
| commit | 78e150c5e9bb5a628d00562ade1fd4bf3635fc4d (patch) | |
| tree | 7d0ec6dc63bd5a309821e9198d254a14f93fd87b /libavcodec/h263dec.c | |
| parent | 2fbc759d08cae97f9361e464a685a149c9d12c72 (diff) | |
| parent | 08303d774132775d49d4ba767092de5d426f089d (diff) | |
Merge remote-tracking branch 'qatar/master'
* qatar/master:
hwaccel: Simplify ff_find_hwaccel
Conflicts:
libavcodec/mpeg12dec.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/h263dec.c')
| -rw-r--r-- | libavcodec/h263dec.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/libavcodec/h263dec.c b/libavcodec/h263dec.c index 15a9a42552..f8785d2fbb 100644 --- a/libavcodec/h263dec.c +++ b/libavcodec/h263dec.c @@ -112,7 +112,7 @@ av_cold int ff_h263_decode_init(AVCodecContext *avctx) return AVERROR(ENOSYS); } s->codec_id = avctx->codec->id; - avctx->hwaccel = ff_find_hwaccel(avctx->codec->id, avctx->pix_fmt); + avctx->hwaccel = ff_find_hwaccel(avctx); if (avctx->stream_codec_tag == AV_RL32("l263") && avctx->extradata_size == 56 && avctx->extradata[0] == 1) s->ehc_mode = 1; |