Merge remote-tracking branch 'qatar/master'

Browse Source

* qatar/master:
  lavc: add support for interleaved chroma formats to libx264.

Conflicts:
	libavcodec/libx264.c

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

pull/36/head

Michael Niedermayer 12 years ago

parent 1fb0d96114 58894ab3f9

commit 4fdf2fa94a

Whitespace

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Split View

Diff Options

Show Stats Download Patch File Download Diff File

Diff Content Not Available