Merge remote-tracking branch 'qatar/master'

[ffmpeg] / libavdevice / dshow.c

diff --git a/libavdevice/dshow.c b/libavdevice/dshow.c
index be8b592e26005e462aca00e9a329cbdebb81ce0d..93bca1d08dfdbc59c13f6ee19f7610a2c1da2746 100644 (file)
--- a/libavdevice/dshow.c
+++ b/libavdevice/dshow.c
@@ -92,7 +92,7 @@ static enum PixelFormat dshow_pixfmt(DWORD biCompression, WORD biBitCount)
     return PIX_FMT_NONE;
 }
 
-static enum CodecID dshow_codecid(DWORD biCompression)
+static enum AVCodecID dshow_codecid(DWORD biCompression)
 {
     switch(biCompression) {
     case MKTAG('d', 'v', 's', 'd'):
@@ -639,7 +639,7 @@ error:
     return ret;
 }
 
-static enum CodecID waveform_codec_id(enum AVSampleFormat sample_fmt)
+static enum AVCodecID waveform_codec_id(enum AVSampleFormat sample_fmt)
 {
     switch (sample_fmt) {
     case AV_SAMPLE_FMT_U8:  return AV_CODEC_ID_PCM_U8;