« Previous | Next » 

Revision 58c03f6d

ID58c03f6d7d6eabdbc25103e8229a06ddf3718bb9
Parent 01d3ebaf, 9f54e461
Child b025431b

Added by Michael Niedermayer over 9 years ago

Merge remote branch 'qatar/master'

  • qatar/master:
    swscale: properly inline bits/endianness in yuv2yuvX16inC().
    (We didnt pull the bug) swscale: fix clipping of 9/10bit YUV420P.
    Add av_clip_uintp2() function
    (our patch / duplicate) dfa: fix buffer overflow checks to avoid integer overflows.
    (our patch / duplicate) movenc: always write esds descriptor length using 4 bytes.
    (our patch / duplicate) ffmpeg: use parse_number_and_die() when it makes sense
    (No thanks) ffmpeg: get rid of the 'q' key schizofrenia

Merged-by: Michael Niedermayer <>

Files

  • added
  • modified
  • copied
  • renamed
  • deleted