Merge commit 'f154ef1ae5b03f288dd8c025dab1884b4cb20c1a'

[ffmpeg] / libavformat / wtvenc.c

diff --git a/libavformat/wtvenc.c b/libavformat/wtvenc.c
index 1f2c7eb1803524aac4e5e2efaa9067de60af3a3b..5bed51e3c09d12b0100a73819abb42deaefeaf14 100644 (file)
--- a/libavformat/wtvenc.c
+++ b/libavformat/wtvenc.c
@@ -113,7 +113,7 @@ static int write_pad(AVIOContext *pb, int size)
     return 0;
 }
 
-static const ff_asf_guid *get_codec_guid(enum CodecID id, const AVCodecGuid *av_guid)
+static const ff_asf_guid *get_codec_guid(enum AVCodecID id, const AVCodecGuid *av_guid)
 {
     int i;
     for (i = 0; av_guid[i].id != AV_CODEC_ID_NONE; i++) {