Merge remote-tracking branch 'cehoyos/master'
authorMichael Niedermayer <michaelni@gmx.at>
Fri, 23 May 2014 19:13:39 +0000 (21:13 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Fri, 23 May 2014 19:13:46 +0000 (21:13 +0200)
commit9340ced47b5b13991619d56c2be86a6604e63f5b
treef970969439152f01dc3e92e12a27349874bafc16
parentd062db788012b94e899008964b93cf01a8389fec
parent27d460fe98218d50e73b995ee8e4dd4bc0953c84
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>