« Previous | Next » 

Revision 455ce979

ID455ce979d0793096662d139e996107a527617832
Parent f0f34253, 5b81e295
Child a3ffe0eb

Added by Michael Niedermayer over 9 years ago

Merge remote branch 'qatar/master'

  • 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: Michael Niedermayer <>

Files

  • added
  • modified
  • copied
  • renamed
  • deleted