• Michael Niedermayer's avatar
    Merge remote-tracking branch 'qatar/master' · 184fc600
    Michael Niedermayer authored
    * qatar/master:
      mpegvideo_enc: only allocate output packet when we know there will be output
      Add names for more channel layouts to the channel layout map.
      sunrast: Add a sample request for RMP_RAW colormap.
      avcodec: do not override pts or duration from the audio encoder
      Add prores regression test.
      Enable already existing rso regression test.
      Add regression test for "sox" format muxer/demuxer.
      Add dpx encoding regression test.
      swscale: K&R formatting cosmetics for PowerPC code (part I/II)
      img2: Use ff_guess_image2_codec(filename) shorthand where appropriate.
      Clarify licensing information about files borrowed from libjpeg.
      Mark mutable static data const where appropriate.
      avplay: fix -threads option
      dvbsubdec: avoid undefined signed left shift in RGBA macro
      mlpdec: use av_log_ask_for_sample()
      gif: K&R formatting cosmetics
      png: make .long_name more descriptive
      movdec: Adjust keyframe flagging in fragmented files
      rv34: change mo...
    184fc600
This project is licensed under the Other. Learn more