On Wed, Jan 7, 2015 at 11:08 PM, Martin Storsjö <[email protected]> wrote: > Also move the .long_name entry to below the .name entry. > --- > configure | 2 +- > libavcodec/libopenh264enc.c | 4 ++-- > 2 files changed, 3 insertions(+), 3 deletions(-) > > diff --git a/configure b/configure > index 09cb30b..5085333 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 150b5f2..4110426 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, > };
imho the "MPEG-4 AVC" name could be dropped, but it seems ok -- Vittorio _______________________________________________ libav-devel mailing list [email protected] https://lists.libav.org/mailman/listinfo/libav-devel
