diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-05-03 13:09:23 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-05-03 13:09:23 +0200 |
| commit | 2e0cc34292d25526f9b91752aa980fd740a0edf7 (patch) | |
| tree | 3e6acbef6a0c59e74e80186711d185713723ceb8 /CREDITS | |
| parent | 9fd5e75bdf62c5aa19163a6033b361dcc8e31238 (diff) | |
| parent | 0574bc06d23a6690a16c5926dddc9be359a3d7bb (diff) | |
| download | ffmpeg-2e0cc34292d25526f9b91752aa980fd740a0edf7.tar.gz | |
Merge commit '0574bc06d23a6690a16c5926dddc9be359a3d7bb'
* commit '0574bc06d23a6690a16c5926dddc9be359a3d7bb':
matroskaenc: cosmetics, reorder the #includes
Conflicts:
libavformat/matroskaenc.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'CREDITS')
0 files changed, 0 insertions, 0 deletions