diff options
| author | Diego Biurrun <diego@biurrun.de> | 2011-04-26 14:28:45 +0200 |
|---|---|---|
| committer | Diego Biurrun <diego@biurrun.de> | 2011-07-07 22:53:51 +0200 |
| commit | f9853c1b9c4b4a0b8599e4dbce292586e87100cc (patch) | |
| tree | 943bdde0a4183f2b35201c6c833c73261e6fb9a2 /libavdevice | |
| parent | bb83478d2c91db2c9150bb78568ccef25f0e975f (diff) | |
| download | ffmpeg-f9853c1b9c4b4a0b8599e4dbce292586e87100cc.tar.gz | |
libavdevice: Remove disabled code.
Diffstat (limited to 'libavdevice')
| -rw-r--r-- | libavdevice/oss_audio.c | 7 | ||||
| -rw-r--r-- | libavdevice/x11grab.c | 15 |
2 files changed, 0 insertions, 22 deletions
diff --git a/libavdevice/oss_audio.c b/libavdevice/oss_audio.c index fcbe26ba93..6e25288dba 100644 --- a/libavdevice/oss_audio.c +++ b/libavdevice/oss_audio.c @@ -80,13 +80,6 @@ static int audio_open(AVFormatContext *s1, int is_output, const char *audio_devi fcntl(audio_fd, F_SETFL, O_NONBLOCK); s->frame_size = AUDIO_BLOCK_SIZE; -#if 0 - tmp = (NB_FRAGMENTS << 16) | FRAGMENT_BITS; - err = ioctl(audio_fd, SNDCTL_DSP_SETFRAGMENT, &tmp); - if (err < 0) { - perror("SNDCTL_DSP_SETFRAGMENT"); - } -#endif /* select format : favour native format */ err = ioctl(audio_fd, SNDCTL_DSP_GETFMTS, &tmp); diff --git a/libavdevice/x11grab.c b/libavdevice/x11grab.c index 6e77a5c52a..62cb4f1a4f 100644 --- a/libavdevice/x11grab.c +++ b/libavdevice/x11grab.c @@ -217,21 +217,6 @@ x11grab_read_header(AVFormatContext *s1, AVFormatParameters *ap) } break; case 32: -#if 0 - GetColorInfo (image, &c_info); - if ( c_info.alpha_mask == 0xff000000 && image->green_mask == 0x0000ff00) { - /* byte order is relevant here, not endianness - * endianness is handled by avcodec, but atm no such thing - * as having ABGR, instead of ARGB in a word. Since we - * need this for Solaris/SPARC, but need to do the conversion - * for every frame we do it outside of this loop, cf. below - * this matches both ARGB32 and ABGR32 */ - input_pixfmt = PIX_FMT_ARGB32; - } else { - av_log(s1, AV_LOG_ERROR,"image depth %i not supported ... aborting\n", image->bits_per_pixel); - return AVERROR(EIO); - } -#endif input_pixfmt = PIX_FMT_RGB32; break; default: |