diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-08-20 11:05:02 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-08-20 11:05:02 +0200 |
| commit | 976de369ddeb395af6e0aad76f63aa1d37e14aac (patch) | |
| tree | de5f801338cfae729c464eaf4c1b29a4c6c83ad4 /libavformat/cdxl.c | |
| parent | d9b0b54a5f8bcd7f8fb01d6d008d3798a20dc43b (diff) | |
| parent | 148fbdd1c2a2a88a78ba9fd152c81c840bdb205a (diff) | |
| download | ffmpeg-976de369ddeb395af6e0aad76f63aa1d37e14aac.tar.gz | |
Merge commit '148fbdd1c2a2a88a78ba9fd152c81c840bdb205a'
* commit '148fbdd1c2a2a88a78ba9fd152c81c840bdb205a':
mkv: Refactor mkv_write_packet
Conflicts:
libavformat/matroskaenc.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavformat/cdxl.c')
0 files changed, 0 insertions, 0 deletions