libavdevice: Remove disabled code.
This commit is contained in:
		
							parent
							
								
									bb83478d2c
								
							
						
					
					
						commit
						f9853c1b9c
					
				@ -80,13 +80,6 @@ static int audio_open(AVFormatContext *s1, int is_output, const char *audio_devi
 | 
				
			|||||||
        fcntl(audio_fd, F_SETFL, O_NONBLOCK);
 | 
					        fcntl(audio_fd, F_SETFL, O_NONBLOCK);
 | 
				
			||||||
 | 
					
 | 
				
			||||||
    s->frame_size = AUDIO_BLOCK_SIZE;
 | 
					    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 */
 | 
					    /* select format : favour native format */
 | 
				
			||||||
    err = ioctl(audio_fd, SNDCTL_DSP_GETFMTS, &tmp);
 | 
					    err = ioctl(audio_fd, SNDCTL_DSP_GETFMTS, &tmp);
 | 
				
			||||||
 | 
				
			|||||||
@ -217,21 +217,6 @@ x11grab_read_header(AVFormatContext *s1, AVFormatParameters *ap)
 | 
				
			|||||||
        }
 | 
					        }
 | 
				
			||||||
        break;
 | 
					        break;
 | 
				
			||||||
    case 32:
 | 
					    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;
 | 
					        input_pixfmt = PIX_FMT_RGB32;
 | 
				
			||||||
        break;
 | 
					        break;
 | 
				
			||||||
    default:
 | 
					    default:
 | 
				
			||||||
 | 
				
			|||||||
		Loading…
	
	
			
			x
			
			
		
	
		Reference in New Issue
	
	Block a user