diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-05-11 21:48:32 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-05-11 21:48:32 +0200 |
| commit | d93cf093f840b9a28481c73d7e421f469f2ca4e7 (patch) | |
| tree | 6159a41d2f67277f41953dd72ae349c3e2670155 /libavcodec/utils.c | |
| parent | 5e95551199871e5912c7bd498cbcc502d33113aa (diff) | |
| parent | 632ad2248e2e5d8cd4b51e6c87c943a38c3da425 (diff) | |
| download | ffmpeg-streaming-d93cf093f840b9a28481c73d7e421f469f2ca4e7.zip ffmpeg-streaming-d93cf093f840b9a28481c73d7e421f469f2ca4e7.tar.gz | |
Merge commit '632ad2248e2e5d8cd4b51e6c87c943a38c3da425'
* commit '632ad2248e2e5d8cd4b51e6c87c943a38c3da425':
lavc: Add an internal wrapper around get_format()
Conflicts:
libavcodec/h264_slice.c
libavcodec/mpeg12dec.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/utils.c')
| -rw-r--r-- | libavcodec/utils.c | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/libavcodec/utils.c b/libavcodec/utils.c index b899392..f8fa359 100644 --- a/libavcodec/utils.c +++ b/libavcodec/utils.c @@ -1117,6 +1117,11 @@ enum AVPixelFormat avcodec_default_get_format(struct AVCodecContext *s, const en return fmt[0]; } +int ff_get_format(AVCodecContext *avctx, const enum AVPixelFormat *fmt) +{ + return avctx->get_format(avctx, fmt); +} + #if FF_API_AVFRAME_LAVC void avcodec_get_frame_defaults(AVFrame *frame) { @@ -3424,7 +3429,7 @@ int ff_thread_ref_frame(ThreadFrame *dst, ThreadFrame *src) enum AVPixelFormat ff_thread_get_format(AVCodecContext *avctx, const enum AVPixelFormat *fmt) { - return avctx->get_format(avctx, fmt); + return ff_get_format(avctx, fmt); } int ff_thread_get_buffer(AVCodecContext *avctx, ThreadFrame *f, int flags) |
