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/internal.h | |
| 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/internal.h')
| -rw-r--r-- | libavcodec/internal.h | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/libavcodec/internal.h b/libavcodec/internal.h index 6a89696d68..f06efe7e54 100644 --- a/libavcodec/internal.h +++ b/libavcodec/internal.h @@ -126,11 +126,10 @@ struct AVCodecDefault { * Return the hardware accelerated codec for codec codec_id and * pixel format pix_fmt. * - * @param codec_id the codec to match - * @param pix_fmt the pixel format to match + * @param avctx The codec context containing the codec_id and pixel format. * @return the hardware accelerated codec, or NULL if none was found. */ -AVHWAccel *ff_find_hwaccel(enum AVCodecID codec_id, enum AVPixelFormat pix_fmt); +AVHWAccel *ff_find_hwaccel(AVCodecContext *avctx); /** * Return the index into tab at which {a,b} match elements {[0],[1]} of tab. |