On Tue, 26 Apr 2011 16:07:05 +0200, Diego Biurrun <[email protected]> wrote: > --- > libavdevice/oss_audio.c | 7 ------- > libavdevice/x11grab.c | 15 --------------- > 2 files changed, 0 insertions(+), 22 deletions(-) > > diff --git a/libavdevice/oss_audio.c b/libavdevice/oss_audio.c > index 7c4a65d..d0d0f6a 100644 > --- a/libavdevice/oss_audio.c > +++ b/libavdevice/oss_audio.c > @@ -78,13 +78,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 aaad729..f92e180 100644 > --- a/libavdevice/x11grab.c > +++ b/libavdevice/x11grab.c > @@ -193,21 +193,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: > -- > 1.7.1
Ok. -- Anton Khirnov _______________________________________________ libav-devel mailing list [email protected] https://lists.libav.org/mailman/listinfo/libav-devel
