diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2015-03-18 01:01:30 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2015-03-18 01:09:35 +0100 |
| commit | 4fae55632236277865f736431bdf1dfaa0649116 (patch) | |
| tree | 7828487712c4cfcbeadc1ccec9c2f46ec99f93ea /libavcodec | |
| parent | bf2bd5b807bc3b4d5d61b0fac584701b42479b40 (diff) | |
| parent | 58a840e21577a2168843487a98cb2cea44b5a94a (diff) | |
| download | ffmpeg-4fae55632236277865f736431bdf1dfaa0649116.tar.gz | |
Merge commit '58a840e21577a2168843487a98cb2cea44b5a94a'
* commit '58a840e21577a2168843487a98cb2cea44b5a94a':
Replace a few leftover instances of enum PixelFormat with enum AVPixelFormat
See: ac627b3d38d370027406c93c2dcaac0b1712a7d4
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec')
| -rw-r--r-- | libavcodec/libopenh264enc.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/libavcodec/libopenh264enc.c b/libavcodec/libopenh264enc.c index 00fd9df00d..2b7bad3a08 100644 --- a/libavcodec/libopenh264enc.c +++ b/libavcodec/libopenh264enc.c @@ -228,7 +228,7 @@ AVCodec ff_libopenh264_encoder = { .encode2 = svc_encode_frame, .close = svc_encode_close, .capabilities = CODEC_CAP_AUTO_THREADS, - .pix_fmts = (const enum PixelFormat[]){ AV_PIX_FMT_YUV420P, - AV_PIX_FMT_NONE }, + .pix_fmts = (const enum AVPixelFormat[]){ AV_PIX_FMT_YUV420P, + AV_PIX_FMT_NONE }, .priv_class = &class, }; |