diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-11-10 17:37:51 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-11-10 17:37:51 +0100 |
| commit | 78e150c5e9bb5a628d00562ade1fd4bf3635fc4d (patch) | |
| tree | 7d0ec6dc63bd5a309821e9198d254a14f93fd87b /libavcodec/mpeg12dec.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/mpeg12dec.c')
| -rw-r--r-- | libavcodec/mpeg12dec.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/libavcodec/mpeg12dec.c b/libavcodec/mpeg12dec.c index 8d8bc98ed0..372d18f083 100644 --- a/libavcodec/mpeg12dec.c +++ b/libavcodec/mpeg12dec.c @@ -1180,7 +1180,7 @@ static void setup_hwaccel_for_pixfmt(AVCodecContext *avctx) } else if (!avctx->xvmc_acceleration) { avctx->xvmc_acceleration = 2; } - avctx->hwaccel = ff_find_hwaccel(avctx->codec->id, avctx->pix_fmt); + avctx->hwaccel = ff_find_hwaccel(avctx); // until then pix_fmt may be changed right after codec init if (avctx->pix_fmt == AV_PIX_FMT_XVMC_MPEG2_IDCT || avctx->hwaccel || uses_vdpau(avctx)) |