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)
* cehoyos/master:
  Refuse to mux H.264 with fourcc H264 into avi without startcode.

Merged-by: Michael Niedermayer <michaelni@gmx.at>

Trivial merge