diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-08-20 11:15:11 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-08-20 11:15:11 +0200 |
| commit | ac957bc60cec69bd5724fe6f41b6fb979ac6612c (patch) | |
| tree | 7da2cc23919d8a3b0cfd83e3c2f542bcc01db48d /libavcodec/brender_pix.c | |
| parent | 976de369ddeb395af6e0aad76f63aa1d37e14aac (diff) | |
| parent | 98308bd44face14ea3142b501d16226eec23b75a (diff) | |
| download | ffmpeg-ac957bc60cec69bd5724fe6f41b6fb979ac6612c.tar.gz | |
Merge commit '98308bd44face14ea3142b501d16226eec23b75a'
* commit '98308bd44face14ea3142b501d16226eec23b75a':
mkv: Add options for specifying cluster limits
Conflicts:
libavformat/matroskaenc.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/brender_pix.c')
0 files changed, 0 insertions, 0 deletions