diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2015-01-15 12:45:20 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2015-01-15 12:45:20 +0100 |
| commit | 06ec2f1d321830e3a7dd24e3d0a10bd886c8c74b (patch) | |
| tree | b420825f37fe5aca9fc7ab18898ea196122ac562 /tests/md5.sh | |
| parent | 3b3229aef322f2348c8e9e389a22d7b7fd7ef7f4 (diff) | |
| parent | 8809c974a3fb51f96e498a5556a4a5bbacc581ce (diff) | |
| download | ffmpeg-06ec2f1d321830e3a7dd24e3d0a10bd886c8c74b.tar.gz | |
Merge commit '8809c974a3fb51f96e498a5556a4a5bbacc581ce'
* commit '8809c974a3fb51f96e498a5556a4a5bbacc581ce':
id3v2: constify the 'tag' parameter to special metadata parsing callback
Conflicts:
libavformat/id3v2.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'tests/md5.sh')
0 files changed, 0 insertions, 0 deletions