in TRUNCATED mode, use residual fragments in ParseContext

[ffmpeg] / libavcodec / libx264.c

diff --git a/libavcodec/libx264.c b/libavcodec/libx264.c
index c9df820f5d851fbcf14acb779086ceb600e05d17..f82083a6c49bbe5c1a629a04ec70f8398ef2b870 100644 (file)
--- a/libavcodec/libx264.c
+++ b/libavcodec/libx264.c
@@ -1,6 +1,6 @@
 /*
  * H.264 encoding using the x264 library
- * Copyright (C) 2005  Mans Rullgard <mru@inprovide.com>
+ * Copyright (C) 2005  Mans Rullgard <mans@mansr.com>
  *
  * This file is part of FFmpeg.
  *
@@ -38,7 +38,7 @@ X264_log(void *p, int level, const char *fmt, va_list args)
 {
     static const int level_map[] = {
         [X264_LOG_ERROR]   = AV_LOG_ERROR,
-        [X264_LOG_WARNING] = AV_LOG_ERROR,
+        [X264_LOG_WARNING] = AV_LOG_WARNING,
         [X264_LOG_INFO]    = AV_LOG_INFO,
         [X264_LOG_DEBUG]   = AV_LOG_DEBUG
     };
@@ -119,7 +119,7 @@ X264_frame(AVCodecContext *ctx, uint8_t *buf, int bufsize, void *data)
     return bufsize;
 }
 
-static int
+static av_cold int
 X264_close(AVCodecContext *avctx)
 {
     X264Context *x4 = avctx->priv_data;
@@ -130,7 +130,7 @@ X264_close(AVCodecContext *avctx)
     return 0;
 }
 
-static int
+static av_cold int
 X264_init(AVCodecContext *avctx)
 {
     X264Context *x4 = avctx->priv_data;
@@ -287,8 +287,8 @@ X264_init(AVCodecContext *avctx)
     return 0;
 }
 
-AVCodec x264_encoder = {
-    .name = "h264",
+AVCodec libx264_encoder = {
+    .name = "libx264",
     .type = CODEC_TYPE_VIDEO,
     .id = CODEC_ID_H264,
     .priv_data_size = sizeof(X264Context),
@@ -296,5 +296,6 @@ AVCodec x264_encoder = {
     .encode = X264_frame,
     .close = X264_close,
     .capabilities = CODEC_CAP_DELAY,
-    .pix_fmts = (enum PixelFormat[]) { PIX_FMT_YUV420P, -1 }
+    .pix_fmts = (enum PixelFormat[]) { PIX_FMT_YUV420P, PIX_FMT_NONE },
+    .long_name = "libx264 H.264 / AVC / MPEG-4 AVC / MPEG-4 part 10",
 };