diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2015-01-08 17:26:57 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2015-01-08 17:27:19 +0100 |
| commit | 93870f0a0b71328d4502d8f979481e42e3cb71b4 (patch) | |
| tree | 03d04678d4b8663299a06155e02b220e755876e1 /libavcodec | |
| parent | de8f70b8e02dd0b036c5bd0b219dd495de976b58 (diff) | |
| parent | 3852e2c926ddb166c7aa69c4644a86100ea144d9 (diff) | |
| download | ffmpeg-93870f0a0b71328d4502d8f979481e42e3cb71b4.tar.gz | |
Merge commit '3852e2c926ddb166c7aa69c4644a86100ea144d9'
* commit '3852e2c926ddb166c7aa69c4644a86100ea144d9':
libopenh264enc: Fix a typo and some nitpicks
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 ed32b41b93..07262b96dc 100644 --- a/libavcodec/libopenh264enc.c +++ b/libavcodec/libopenh264enc.c @@ -182,7 +182,7 @@ static int svc_encode_frame(AVCodecContext *avctx, AVPacket *avpkt, return 0; } first_layer = 0; - // Normal frames are returned with one single layers, while IDR + // Normal frames are returned with one single layer, while IDR // frames have two layers, where the first layer contains the SPS/PPS. // If using global headers, don't include the SPS/PPS in the returned // packet - thus, only return one layer. @@ -214,6 +214,7 @@ static int svc_encode_frame(AVCodecContext *avctx, AVPacket *avpkt, AVCodec ff_libopenh264_encoder = { .name = "libopenh264", + .long_name = NULL_IF_CONFIG_SMALL("OpenH264 H.264 / AVC / MPEG-4 AVC / MPEG-4 part 10"), .type = AVMEDIA_TYPE_VIDEO, .id = AV_CODEC_ID_H264, .priv_data_size = sizeof(SVCContext), @@ -223,6 +224,5 @@ AVCodec ff_libopenh264_encoder = { .capabilities = CODEC_CAP_AUTO_THREADS, .pix_fmts = (const enum PixelFormat[]){ AV_PIX_FMT_YUV420P, AV_PIX_FMT_NONE }, - .long_name = NULL_IF_CONFIG_SMALL("OpenH264"), .priv_class = &class, }; |