g723_1dec: remove unneeded cliping that leaked in from merge from libav

[ffmpeg] / libavcodec / flvenc.c

diff --git a/libavcodec/flvenc.c b/libavcodec/flvenc.c
index 8cc2c9a604b2d7c57af92f0210639364c72e99da..acd81b3676391d0c8abe23301200edf6c00439c3 100644 (file)
--- a/libavcodec/flvenc.c
+++ b/libavcodec/flvenc.c
@@ -89,12 +89,12 @@ FF_MPV_GENERIC_CLASS(flv)
 AVCodec ff_flv_encoder = {
     .name           = "flv",
     .type           = AVMEDIA_TYPE_VIDEO,
-    .id             = CODEC_ID_FLV1,
+    .id             = AV_CODEC_ID_FLV1,
     .priv_data_size = sizeof(MpegEncContext),
     .init           = ff_MPV_encode_init,
     .encode2        = ff_MPV_encode_picture,
     .close          = ff_MPV_encode_end,
     .pix_fmts       = (const enum PixelFormat[]){ PIX_FMT_YUV420P, PIX_FMT_NONE },
-    .long_name      = NULL_IF_CONFIG_SMALL("Flash Video (FLV) / Sorenson Spark / Sorenson H.263"),
+    .long_name      = NULL_IF_CONFIG_SMALL("FLV / Sorenson Spark / Sorenson H.263 (Flash Video)"),
     .priv_class     = &flv_class,
 };