aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMartin Storsjö <martin@martin.st>2015-01-08 00:03:09 +0200
committerMartin Storsjö <martin@martin.st>2015-01-08 13:53:25 +0200
commit3852e2c926ddb166c7aa69c4644a86100ea144d9 (patch)
tree771818cf444a8885468d9398b6c5a159390249b2
parent71ec3d36fa6122b3b6c5c68a21b9c70cb2e668e8 (diff)
downloadffmpeg-3852e2c926ddb166c7aa69c4644a86100ea144d9.tar.gz
libopenh264enc: Fix a typo and some nitpicks
Also move the .long_name entry to below the .name entry. Signed-off-by: Martin Storsjö <martin@martin.st>
-rwxr-xr-xconfigure2
-rw-r--r--libavcodec/libopenh264enc.c4
2 files changed, 3 insertions, 3 deletions
diff --git a/configure b/configure
index 09cb30b5f3..5085333b2b 100755
--- a/configure
+++ b/configure
@@ -193,7 +193,7 @@ External library support:
--enable-libopencore-amrnb enable AMR-NB de/encoding via libopencore-amrnb [no]
--enable-libopencore-amrwb enable AMR-WB decoding via libopencore-amrwb [no]
--enable-libopencv enable video filtering via libopencv [no]
- --enable-libopenh264 enable H264 encoding via OpenH264 [no]
+ --enable-libopenh264 enable H.264 encoding via OpenH264 [no]
--enable-libopenjpeg enable JPEG 2000 de/encoding via OpenJPEG [no]
--enable-libopus enable Opus de/encoding via libopus [no]
--enable-libpulse enable Pulseaudio input via libpulse [no]
diff --git a/libavcodec/libopenh264enc.c b/libavcodec/libopenh264enc.c
index 150b5f2f6d..4110426377 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,
};