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/internal.h | |
| parent | d93cf093f840b9a28481c73d7e421f469f2ca4e7 (diff) | |
| parent | 5c1d7246cd65dc4db1b6dc36e29ce39fc1068f3f (diff) | |
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/internal.h')
| -rw-r--r-- | libavcodec/internal.h | 9 |
1 files changed, 0 insertions, 9 deletions
diff --git a/libavcodec/internal.h b/libavcodec/internal.h index abe9fb93b9..8e6ed291f2 100644 --- a/libavcodec/internal.h +++ b/libavcodec/internal.h @@ -132,15 +132,6 @@ struct AVCodecDefault { extern const uint8_t ff_log2_run[41]; /** - * Return the hardware accelerated codec for codec codec_id and - * pixel format pix_fmt. - * - * @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(AVCodecContext *avctx); - -/** * Return the index into tab at which {a,b} match elements {[0],[1]} of tab. * If there is no such matching pair then size is returned. */ |