Revert "dsputil: make {add/put/put_signed}_pixels_clamped() non-static."

[ffmpeg] / libavcodec / flvdec.c

diff --git a/libavcodec/flvdec.c b/libavcodec/flvdec.c
index 29d680849dd1e33edb4432f91fcc1c0f531d3383..dfed95bd8983c01ffd481d6a551bad28735137bc 100644 (file)
--- a/libavcodec/flvdec.c
+++ b/libavcodec/flvdec.c
@@ -121,13 +121,12 @@ int ff_flv_decode_picture_header(MpegEncContext *s)
 AVCodec ff_flv_decoder = {
     .name           = "flv",
     .type           = AVMEDIA_TYPE_VIDEO,
-    .id             = CODEC_ID_FLV1,
+    .id             = AV_CODEC_ID_FLV1,
     .priv_data_size = sizeof(MpegEncContext),
     .init           = ff_h263_decode_init,
     .close          = ff_h263_decode_end,
     .decode         = ff_h263_decode_frame,
     .capabilities   = CODEC_CAP_DRAW_HORIZ_BAND | CODEC_CAP_DR1,
-    .max_lowres= 3,
-    .long_name= NULL_IF_CONFIG_SMALL("Flash Video (FLV) / Sorenson Spark / Sorenson H.263"),
-    .pix_fmts= ff_pixfmt_list_420,
+    .long_name      = NULL_IF_CONFIG_SMALL("FLV / Sorenson Spark / Sorenson H.263 (Flash Video)"),
+    .pix_fmts       = ff_pixfmt_list_420,
 };