diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-08-06 15:26:04 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-08-06 15:26:04 +0200 |
| commit | 560e9365b6eb6ce34eddea1a582047e09022fcb0 (patch) | |
| tree | f5c100558cf72518d6b6939aeff8d371d52468e7 /libavformat/unix.c | |
| parent | 5dd8ca7d1b5401d5bfe078f4129db199fe317ad5 (diff) | |
| parent | bc54c2ae3ca6abd225dc331eafc12108513158de (diff) | |
Merge commit 'bc54c2ae3ca6abd225dc331eafc12108513158de'
* commit 'bc54c2ae3ca6abd225dc331eafc12108513158de':
libx264: add shortcut for the bluray compatibility option
Conflicts:
doc/encoders.texi
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavformat/unix.c')
0 files changed, 0 insertions, 0 deletions