Merge remote-tracking branch 'qatar/master'
authorMichael Niedermayer <michaelni@gmx.at>
Tue, 24 Sep 2013 13:53:50 +0000 (15:53 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Tue, 24 Sep 2013 13:53:50 +0000 (15:53 +0200)
* qatar/master:
  lavc: add support for interleaved chroma formats to libx264.

Conflicts:
libavcodec/libx264.c

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

Trivial merge