[FFmpeg-devel] [PATCH 16/17] lavc: rename codec_names.h to codec.names.

[Clément Bœsch]

From: Clément Bœsch <clement.boesch at smartjog.com>

The generated header isn't really one and breaks make checkheaders.
---
 .gitignore          |    2 +-
 libavcodec/Makefile |    4 ++--
 libavcodec/utils.c  |    2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/.gitignore b/.gitignore
index eeb375c..efbe2fb 100644
--- a/.gitignore
+++ b/.gitignore
@@ -36,7 +36,7 @@ doc/print_options
 libavcodec/*_tablegen
 libavcodec/*_tables.c
 libavcodec/*_tables.h
-libavcodec/codec_names.h
+libavcodec/codec.names
 libavutil/avconfig.h
 tests/audiogen
 tests/base64
diff --git a/libavcodec/Makefile b/libavcodec/Makefile
index 54e79af..46c8db8 100644
--- a/libavcodec/Makefile
+++ b/libavcodec/Makefile
@@ -831,7 +831,7 @@ endif
 
 CODEC_NAMES_SH := $(SRC_PATH)/$(SUBDIR)codec_names.sh
 AVCODEC_H      := $(SRC_PATH)/$(SUBDIR)avcodec.h
-$(SUBDIR)codec_names.h: $(CODEC_NAMES_SH) config.h $(AVCODEC_H)
+$(SUBDIR)codec.names: $(CODEC_NAMES_SH) config.h $(AVCODEC_H)
 	$(CC) $(CPPFLAGS) $(CFLAGS) -E $(AVCODEC_H) | \
 	$(CODEC_NAMES_SH) config.h $@
-$(SUBDIR)utils.o: $(SUBDIR)codec_names.h
+$(SUBDIR)utils.o: $(SUBDIR)codec.names
diff --git a/libavcodec/utils.c b/libavcodec/utils.c
index 79b3554..9ba5e47 100644
--- a/libavcodec/utils.c
+++ b/libavcodec/utils.c
@@ -1669,7 +1669,7 @@ const char *avcodec_get_name(enum CodecID id)
 
 #if !CONFIG_SMALL
     switch (id) {
-#include "libavcodec/codec_names.h"
+#include "libavcodec/codec.names"
     }
     av_log(NULL, AV_LOG_WARNING, "Codec 0x%x is not in the full list.\n", id);
 #endif
-- 
1.7.9.5