diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-12-08 23:01:42 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-12-08 23:16:43 +0100 |
| commit | 885e74622e3f3be31aebee35540339c7652e723f (patch) | |
| tree | ee720d71fa45f1e4db91c94a08644611f4550595 /libavresample/options.c | |
| parent | 4acc717a05f27752a728c231f9df9dcd042c92d3 (diff) | |
| parent | e2e07dbaab1f17e995842b7eacec4665d44c3d14 (diff) | |
| download | ffmpeg-885e74622e3f3be31aebee35540339c7652e723f.tar.gz | |
Merge commit 'e2e07dbaab1f17e995842b7eacec4665d44c3d14'
* commit 'e2e07dbaab1f17e995842b7eacec4665d44c3d14':
mov: expand the list of parsed metadata tags
Conflicts:
libavformat/mov.c
See: 543f3db9784348499a1ac1088373e2fb9100d4c0
See: dadf668df20e041b330fa4d3c5feb32a3f495d32
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavresample/options.c')
0 files changed, 0 insertions, 0 deletions