opensource/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2026-03-13 09:00:40 +08:00
Code Issues Packages Projects Releases Wiki Activity
Files
a94de50ba02f5c260ca7c571b43fb595c8f951b6
FFmpeg/libavcodec/internal.h
Michael Niedermayer c08e523586 Merge commit '4a0f6651434c6f213d830140f575b4ec7858519f' 
* commit '4a0f6651434c6f213d830140f575b4ec7858519f':
  libavcodec: when decoding, copy replaygain side data to decoded frames

Conflicts:
	libavcodec/internal.h
	libavcodec/rawdec.c
	libavcodec/utils.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-03-24 14:26:17 +01:00

7.7 KiB
Raw Blame History

View Raw
Reference in New Issue View Git Blame Copy Permalink