ffmpeg | branch: master | Michael Niedermayer <michae...@gmx.at> | Fri Jan 16
13:10:04 2015 +0100| [aee51ee8b9b87b16bd1ecced9d984344f8d4d4ea] | committer:
Michael Niedermayer
Merge commit '2df7277711cbe3ca5415ff8e31228dcffa309211'
* commit '2df7277711cbe3ca5415ff8e31228dcffa309211':
swscale: fix gbrap to gbrap alpha scaling
Conflicts:
libswscale/input.c
tests/ref/fate/filter-pixfmts-scale
Not merged, the code works fine as is and does not work with this
change
Merged-by: Michael Niedermayer <michae...@gmx.at>
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=aee51ee8b9b87b16bd1ecced9d984344f8d4d4ea
---
_______________________________________________
ffmpeg-cvslog mailing list
ffmpeg-cvslog@ffmpeg.org
http://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog
