ffmpeg | branch: master | Michael Niedermayer <[email protected]> | Mon Aug  4 
22:26:13 2014 +0200| [2f5bf2f7f20f29bad8c459824eaf33f2e0e483b5] | committer: 
Michael Niedermayer

Merge commit 'f84a1b597c29dc035b8d5529ef88c2d7ff057820'

* commit 'f84a1b597c29dc035b8d5529ef88c2d7ff057820':
  swscale: support AV_PIX_FMT_YA16 as input

Conflicts:
        libswscale/swscale_unscaled.c

Merged-by: Michael Niedermayer <[email protected]>

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=2f5bf2f7f20f29bad8c459824eaf33f2e0e483b5
---



_______________________________________________
ffmpeg-cvslog mailing list
[email protected]
http://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog

Reply via email to