« Previous | Next » 

Revision 1caa4123

ID1caa4123bd83f8b1f8a4e11a8d8539be7d54b105
Parent 8b8bf89e, 229e2631
Child 1e96d4c7

Added by Michael Niedermayer over 9 years ago

Merge remote-tracking branch 'newdev/master'

  • newdev/master:
    rtsp: Use GET_PARAMETER for keep-alive for generic RTSP servers
    mlp_parse.c: set AVCodecContext channel_layout
    APIChanges: mark the place where 0.6 was branched.
    avio: make get_checksum() internal.
    avio: move ff_crc04C11DB7_update() from avio.h -> avio_internal.h
    avio: make init_checksum() internal.
    NOT MERGED Add MxPEG decoder
    NOT MERGED Add support for picture_ptr field in MJpegDecodeContext
    NOT MERGED Move MJPEG's input buffer preprocessing in separate public function
    NOT MERGED Support reference picture defined by bitmask in MJPEG's SOS decoder
    sndio bug fix

Merged-by: Michael Niedermayer <>

Files

  • added
  • modified
  • copied
  • renamed
  • deleted