« Previous | Next » 

Revision 73a502dd

ID73a502dd436425875fae1305d47cf0c1fbf24d68
Parent ea189b77, 075933a0
Child 563fe360

Added by Michael Niedermayer over 9 years ago

Merge branch 'master' into oldabi

  • master: (37 commits)
    vsrc_buffer: 10l mixed up input & output sizes. (funnily this worked 99% of the time) Signed-off-by: Michael Niedermayer <>
    Add MxPEG decoder
    Add support for picture_ptr field in MJpegDecodeContext
    Move MJPEG's input buffer preprocessing in separate public function
    Support reference picture defined by bitmask in MJPEG's SOS decoder
    DCA/DTA encoder
    vsrc_buffer: Reinit scale filter when an existing filter is used. Signed-off-by: Michael Niedermayer <>
    vsrc_buffer: set output timebase when output equalization is done Signed-off-by: Michael Niedermayer <>
    vsrc_buffer: Set output size Signed-off-by: Michael Niedermayer <>
    vsrc_buffer: fix NULL dereference Signed-off-by: Michael Niedermayer <>
    bfi: store palette data in the context
    Fix issue1503, this fix may be incomplete we need more samples to know for sure. Signed-off-by: Michael Niedermayer <>
    wmadec: prevent null pointer call. Signed-off-by: Michael Niedermayer <>
    fraps: do not set avctx->pix_fmt to none in decode_init()
    graphparser: add a NULL check on the argument passed to strstr
    setdar: prefer "sar" over "par" in log info message
    fade: fix draw_slice() check on fade->factor value
    fade: make draw_slice() chroma check against planes 1 and 2
    lsws: prevent overflow in sws_init_context()
    ffplay: fix logic for selecting the show mode in case of missing video
    ...

Conflicts:
libavformat/avidec.c

Merged-by: Michael Niedermayer <>

Files

  • added
  • modified
  • copied
  • renamed
  • deleted