Mercurial > mplayer.hg
comparison libmpdemux/tvi_v4l.c @ 14245:815f03b7cee5
removing AFMT_ dependancy
| author | alex |
|---|---|
| date | Mon, 27 Dec 2004 17:30:15 +0000 |
| parents | baa9d1f8487e |
| children | eda61c6a927f |
comparison
equal
deleted
inserted
replaced
| 14244:9b03ad0254ae | 14245:815f03b7cee5 |
|---|---|
| 39 #ifdef HAVE_SYS_SYSINFO_H | 39 #ifdef HAVE_SYS_SYSINFO_H |
| 40 #include <sys/sysinfo.h> | 40 #include <sys/sysinfo.h> |
| 41 #endif | 41 #endif |
| 42 | 42 |
| 43 #include "mp_msg.h" | 43 #include "mp_msg.h" |
| 44 #include "../libao2/afmt.h" | 44 #include "../libaf/af_format.h" |
| 45 #include "../libvo/img_format.h" | 45 #include "../libvo/img_format.h" |
| 46 #include "../libvo/fastmemcpy.h" | 46 #include "../libvo/fastmemcpy.h" |
| 47 #include "../libvo/videodev_mjpeg.h" | 47 #include "../libvo/videodev_mjpeg.h" |
| 48 | 48 |
| 49 #include "tv.h" | 49 #include "tv.h" |
| 1283 } | 1283 } |
| 1284 | 1284 |
| 1285 /* ========== AUDIO controls =========== */ | 1285 /* ========== AUDIO controls =========== */ |
| 1286 case TVI_CONTROL_AUD_GET_FORMAT: | 1286 case TVI_CONTROL_AUD_GET_FORMAT: |
| 1287 { | 1287 { |
| 1288 *(int *)arg = AFMT_S16_LE; | 1288 *(int *)arg = AF_FORMAT_S16_LE; |
| 1289 return(TVI_CONTROL_TRUE); | 1289 return(TVI_CONTROL_TRUE); |
| 1290 } | 1290 } |
| 1291 case TVI_CONTROL_AUD_GET_CHANNELS: | 1291 case TVI_CONTROL_AUD_GET_CHANNELS: |
| 1292 { | 1292 { |
| 1293 *(int *)arg = priv->audio_in.channels; | 1293 *(int *)arg = priv->audio_in.channels; |