diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-03-24 14:26:17 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-03-24 14:26:17 +0100 |
| commit | c08e523586b6be36bee3f73d609733cd80a57674 (patch) | |
| tree | 5d728f8f5c8647e7ffe3197c25875a1b3dee380d /ffmpeg.h | |
| parent | 83e89787984d3f96cb793ebfddc6078d6bc50073 (diff) | |
| parent | 4a0f6651434c6f213d830140f575b4ec7858519f (diff) | |
| download | ffmpeg-c08e523586b6be36bee3f73d609733cd80a57674.tar.gz | |
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>
Diffstat (limited to 'ffmpeg.h')
0 files changed, 0 insertions, 0 deletions