diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-05-04 23:45:24 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-05-04 23:45:24 +0200 |
| commit | 227ac71a60937785a5e5e21618a929ee3b887015 (patch) | |
| tree | 9541a3fb7e9c8dac6b1acb70ea5cb87eb56f04e3 /doc/git-howto.txt | |
| parent | d4e85004ec6f6a1fd5c67862971601a4402f442b (diff) | |
| parent | 696a74e81560889ef2fde76b045c5158a325a7a5 (diff) | |
| download | ffmpeg-227ac71a60937785a5e5e21618a929ee3b887015.tar.gz | |
Merge commit '696a74e81560889ef2fde76b045c5158a325a7a5' into release/1.1
* commit '696a74e81560889ef2fde76b045c5158a325a7a5':
matroska: add the Opus mapping
Conflicts:
libavformat/matroska.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'doc/git-howto.txt')
0 files changed, 0 insertions, 0 deletions