diff options
author | Michael Niedermayer <michaelni@gmx.at> | 2014-05-23 21:13:39 +0200 |
---|---|---|
committer | Michael Niedermayer <michaelni@gmx.at> | 2014-05-23 21:13:46 +0200 |
commit | 9340ced47b5b13991619d56c2be86a6604e63f5b (patch) | |
tree | f970969439152f01dc3e92e12a27349874bafc16 /libavfilter/x86/vf_spp.c | |
parent | d062db788012b94e899008964b93cf01a8389fec (diff) | |
parent | 27d460fe98218d50e73b995ee8e4dd4bc0953c84 (diff) | |
download | ffmpeg-9340ced47b5b13991619d56c2be86a6604e63f5b.tar.gz |
Merge remote-tracking branch 'cehoyos/master'
* cehoyos/master:
Refuse to mux H.264 with fourcc H264 into avi without startcode.
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavfilter/x86/vf_spp.c')
0 files changed, 0 insertions, 0 deletions