diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-12-02 21:45:44 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-12-02 21:45:44 +0100 |
| commit | d0b0fe6691fc67a95f985cad10d7e66c9bc23587 (patch) | |
| tree | d7315fb6d3b0b0c1e1a0e67b11eca86cbbb9e62d /ffserver.c | |
| parent | 1537d0b432d8cad62b6c8af1960674ac452be7ac (diff) | |
| parent | 5639ed9abb58311f82cf3499b682d228290adb09 (diff) | |
Merge commit '5639ed9abb58311f82cf3499b682d228290adb09'
* commit '5639ed9abb58311f82cf3499b682d228290adb09':
mov: do not truncate the language-prefixed tag
Conflicts:
libavformat/mov.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'ffserver.c')
0 files changed, 0 insertions, 0 deletions