Merge commit 'f7986239f4dbec91c743c4c5eb0a2339bd325bf6'
[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