diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2015-05-11 01:46:24 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2015-05-11 01:46:32 +0200 |
| commit | ae99f06e5a5f8010a0050bbb05636515d92064f9 (patch) | |
| tree | 6520736a09ce88d1c4554ac608663ccbdc4619a9 /libavformat/paf.c | |
| parent | 32a4177a627ddce984a5a9ed7023d9a63dcbdf85 (diff) | |
| parent | ac1a1cb948fe29975424e367173b88db48792144 (diff) | |
| download | ffmpeg-ae99f06e5a5f8010a0050bbb05636515d92064f9.tar.gz | |
Merge commit 'ac1a1cb948fe29975424e367173b88db48792144'
* commit 'ac1a1cb948fe29975424e367173b88db48792144':
dashenc: replace attribute id with contentType for the AdaptationSet element
See: 32a4177a627ddce984a5a9ed7023d9a63dcbdf85
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavformat/paf.c')
0 files changed, 0 insertions, 0 deletions