diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-07-07 11:48:05 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-07-07 11:48:05 +0200 |
| commit | b9d55a07f3cd0dc3013d47d819c4102bd64111b1 (patch) | |
| tree | 05132c89a1c79ec016868b6126c81cf140d76869 /libswscale/colorspace-test.c | |
| parent | b7ce510003275460a9b02361a8c98bfec6fa2945 (diff) | |
| parent | f5e646a00ac21e500dae4bcceded790a0fbc5246 (diff) | |
| download | ffmpeg-b9d55a07f3cd0dc3013d47d819c4102bd64111b1.tar.gz | |
Merge remote-tracking branch 'qatar/master'
* qatar/master:
wtv: Mark attachment with a negative stream id
Conflicts:
libavformat/wtv.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libswscale/colorspace-test.c')
0 files changed, 0 insertions, 0 deletions