• Michael Niedermayer's avatar
    Merge remote branch 'qatar/master' · 455ce979
    Michael Niedermayer authored
    * qatar/master:
    LOTS of duplicates ...
      avio: Fix the deprecated fallback URL-prefixed open flags
      avoid duplicate -lm in .pc files
      mpeg12: terminate mpeg2_video_profiles arrays
      network: Check POLLERR and POLLHUP in ff_network_wait_fd
      mpegtsenc: make PMT PID really start on pmt_start_pid
      nut format: support PIX_FMT_BGR48LE and PIX_FMT_BGR48BE
      rawvideo codec: support PIX_FMT_BGR48LE and PIX_FMT_BGR48BE
      hflip: make the filter accept PIX_FMT_BGR48LE and PIX_FMT_BGR48BE pixel formats
      crop: make the filter accept PIX_FMT_BGR48LE and PIX_FMT_BGR48BE pixel formats
      libswcale: PIX_FMT_BGR48LE and PIX_FMT_BGR48BE scaler implementation
    
    Conflicts:
    	configure
    	libswscale/swscale.h
    	tests/ref/lavf/ts
    Merged-by: 's avatarMichael Niedermayer <michaelni@gmx.at>
    455ce979
avio.h 24.1 KB