Merge commit '35c6ce76b107225a19eb33aea38857d2405882af'
[ffmpeg.git] / libavformat / img2_brender_pix.c
2014-09-11 Michael Niedermayeravformat/img2_alias & brender_pix: fix function names
2014-09-11 Michael Niedermayeravformat/img2_brender_pix: Add AVClass and image2 AVOptions
2014-03-28 Michael Niedermayeravformat: add image2 brender pix demuxer