diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2012-08-07 23:57:21 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2012-08-07 23:57:21 +0200 |
| commit | bb2f13c19ff8ff6e5f1c67a5ae53991e64609490 (patch) | |
| tree | 630289d107c50c334def61666962da85342dda5c /libavdevice | |
| parent | 2fc7c818cb7b7bfdca69d17ab9f1b48290dbc3f6 (diff) | |
| download | ffmpeg-bb2f13c19ff8ff6e5f1c67a5ae53991e64609490.tar.gz | |
rename missed CodecID to AVCodecID
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavdevice')
| -rw-r--r-- | libavdevice/dshow.c | 4 | ||||
| -rw-r--r-- | libavdevice/openal-dec.c | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/libavdevice/dshow.c b/libavdevice/dshow.c index be8b592e26..93bca1d08d 100644 --- 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; diff --git a/libavdevice/openal-dec.c b/libavdevice/openal-dec.c index f927b260f7..29db2d51e2 100644 --- a/libavdevice/openal-dec.c +++ b/libavdevice/openal-dec.c @@ -48,7 +48,7 @@ typedef struct { typedef struct { ALCenum al_fmt; - enum CodecID codec_id; + enum AVCodecID codec_id; int channels; } al_format_info; |