Merge commit '932788be5af8dee062c77851b573ea47dd6d047a'
authorMichael Niedermayer <michaelni@gmx.at>
Thu, 15 Jan 2015 11:53:53 +0000 (12:53 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Thu, 15 Jan 2015 11:53:53 +0000 (12:53 +0100)
commit24c76bae5f47c14ed70e4857eaa3138df566b4cc
tree09cf4af511ed3ca66c5c698e86db6c5b5084e08f
parent7eef45a76f82d0760a895f1970145b0d6c95abf2
parent932788be5af8dee062c77851b573ea47dd6d047a
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>
libavformat/id3v2.c