Skip to content
Snippets Groups Projects
Commit 83e89787 authored by Michael Niedermayer's avatar Michael Niedermayer
Browse files

Merge commit '5a7e35dd' 


* commit '5a7e35dd':
  Add replaygain side data type and code for parsing replaygain tags.

Conflicts:
	libavcodec/avcodec.h
	libavcodec/version.h
	libavutil/version.h

Merged-by: default avatarMichael Niedermayer <michaelni@gmx.at>
parents 595ba3b9 5a7e35dd
No related branches found
No related tags found
No related merge requests found
Hide whitespace changes
Inline Side-by-side
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment