« Previous | Next » 

Revision 3788a3c0

ID3788a3c0c03585b0f8180a16d2a15b8e0e033313
Parent 05815b35, f80b381b
Child ff558d7b

Added by Michael Niedermayer over 9 years ago

Merge remote branch 'qatar/master'

  • qatar/master:
    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
    win32: include the correct header in cmdutils.c
    ac3: fix memleak in fixed-point encoder
    flashsv: Return more meaningful error values.
    flashsv: Employ explicit AVCodec struct initializers.
    read AVI palette from the end of extradata
    cosmetics: K&R coding style and more whitespace for Flash Screen Video

Merged-by: Michael Niedermayer <>

Files

  • added
  • modified
  • copied
  • renamed
  • deleted