h264 only partially supported in FF (Still no support for Linux)
and_ff is also 'a' (partial support)
Merge remote-tracking branch 'upstream/master'
Adding note for this pull request per @SaschaNaz
Merge pull request #223 from mco13/master

Update h264 support