diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2015-01-15 12:53:53 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2015-01-15 12:53:53 +0100 |
| commit | 24c76bae5f47c14ed70e4857eaa3138df566b4cc (patch) | |
| tree | 09cf4af511ed3ca66c5c698e86db6c5b5084e08f /libavformat/ircam.h | |
| parent | 7eef45a76f82d0760a895f1970145b0d6c95abf2 (diff) | |
| parent | 932788be5af8dee062c77851b573ea47dd6d047a (diff) | |
| download | ffmpeg-24c76bae5f47c14ed70e4857eaa3138df566b4cc.tar.gz | |
Merge commit '932788be5af8dee062c77851b573ea47dd6d047a'
* commit '932788be5af8dee062c77851b573ea47dd6d047a':
id3v2: add names to the parameters of ID3v2EMFunc.read
Conflicts:
libavformat/id3v2.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavformat/ircam.h')
0 files changed, 0 insertions, 0 deletions