diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-03-27 21:32:38 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-03-27 21:33:41 +0100 |
| commit | 09ebd87a34b99799f906324053b0dcfd87c4205d (patch) | |
| tree | 42ea6e8f7ff11f1008dac472cde5e6b8906ba773 /libavformat/bintext.c | |
| parent | f392949f1ac799ad1d7c1cda66e41c1670022d5a (diff) | |
| parent | bb36b9aa7ef8f2c0993dfe04a358bce76b367d61 (diff) | |
| download | ffmpeg-09ebd87a34b99799f906324053b0dcfd87c4205d.tar.gz | |
Merge remote-tracking branch 'qatar/master'
* qatar/master:
fate: add BRender PIX tests
Conflicts:
tests/fate/image.mak
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavformat/bintext.c')
0 files changed, 0 insertions, 0 deletions