diff options
| author | Michael Niedermayer <[email protected]> | 2013-09-24 15:53:50 +0200 |
|---|---|---|
| committer | Michael Niedermayer <[email protected]> | 2013-09-24 15:53:50 +0200 |
| commit | 4fdf2fa94a3f4658073185f399d6c9c3e5b47272 (patch) | |
| tree | 1d0965bf9152816e68c0c6df46ae91afd9bf2b97 /libavcodec/timecode.c | |
| parent | 1fb0d961149f7d80738828267668c8e847f0cb66 (diff) | |
| parent | 58894ab3f94d29b7497778289a21a166b6441a6a (diff) | |
Merge remote-tracking branch 'qatar/master'
* qatar/master:
lavc: add support for interleaved chroma formats to libx264.
Conflicts:
libavcodec/libx264.c
See: 283fb76d3d6eef1337ed493eae25fc0fc3752ce7
Merged-by: Michael Niedermayer <[email protected]>
Diffstat (limited to 'libavcodec/timecode.c')
0 files changed, 0 insertions, 0 deletions