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/mpeg12dec.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/mpeg12dec.c')
| -rw-r--r-- | libavcodec/mpeg12dec.c | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/libavcodec/mpeg12dec.c b/libavcodec/mpeg12dec.c index 98a732f111..f77fc6e1a8 100644 --- a/libavcodec/mpeg12dec.c +++ b/libavcodec/mpeg12dec.c @@ -1231,7 +1231,6 @@ static enum AVPixelFormat mpeg_get_pixelformat(AVCodecContext *avctx) static void setup_hwaccel_for_pixfmt(AVCodecContext *avctx) { - avctx->hwaccel = ff_find_hwaccel(avctx); // until then pix_fmt may be changed right after codec init if (avctx->hwaccel || uses_vdpau(avctx)) if (avctx->idct_algo == FF_IDCT_AUTO) |