ffmpeg | branch: master | Michael Niedermayer <michae...@gmx.at> | Mon Aug 4
22:12:24 2014 +0200| [6017c98036078283ce3bf4069227fed13f3e0cc0] | committer:
Michael Niedermayer
Merge commit 'e9abafca278f87e1ecc6d50091d99b73ff63c9a6'
* commit 'e9abafca278f87e1ecc6d50091d99b73ff63c9a6':
avutil: add AV_PIX_FMT_YA16 pixel format
Conflicts:
libavutil/pixdesc.c
libavutil/pixfmt.h
libavutil/version.h
Merged-by: Michael Niedermayer <michae...@gmx.at>
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=6017c98036078283ce3bf4069227fed13f3e0cc0
---
_______________________________________________
ffmpeg-cvslog mailing list
ffmpeg-cvslog@ffmpeg.org
http://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog
