diff options
author | Michael Niedermayer <michaelni@gmx.at> | 2014-12-16 02:23:43 +0100 |
---|---|---|
committer | Michael Niedermayer <michaelni@gmx.at> | 2014-12-16 02:23:43 +0100 |
commit | 1a86e29ff0bcd5ecbd97057418f7f7dd814c5d9c (patch) | |
tree | 45910209dfea19c43e5003d4957e00232f0be292 /ffmpeg_vda.c | |
parent | d2f9aefbde5bebac1af9eb6f3c41250fb8d5c0c0 (diff) | |
parent | 6f4364aba9d70dc5fd9f1c88b9c03bf9ea893d40 (diff) | |
download | ffmpeg-1a86e29ff0bcd5ecbd97057418f7f7dd814c5d9c.tar.gz |
Merge commit '6f4364aba9d70dc5fd9f1c88b9c03bf9ea893d40'
* commit '6f4364aba9d70dc5fd9f1c88b9c03bf9ea893d40':
mov: Fix handling of zero-length metadata values
Conflicts:
libavformat/mov.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'ffmpeg_vda.c')
0 files changed, 0 insertions, 0 deletions