diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2015-01-27 18:16:42 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2015-01-27 18:16:42 +0100 |
| commit | 0bdcc27d9598254e79a80f1e016227778b428dbb (patch) | |
| tree | 87c268fd30634dcb7323ebe0f9c2fcb54b3776f3 /libavformat/framecrcenc.c | |
| parent | 62a82c66cd3f03e045867471c5edcc84b4d2b54e (diff) | |
| parent | 4227e4fe7443733fb906f6fb6c265105e8269c74 (diff) | |
| download | ffmpeg-0bdcc27d9598254e79a80f1e016227778b428dbb.tar.gz | |
Merge commit '4227e4fe7443733fb906f6fb6c265105e8269c74'
* commit '4227e4fe7443733fb906f6fb6c265105e8269c74':
lavf: add a convenience function for adding side data to a stream
Conflicts:
libavformat/internal.h
libavformat/replaygain.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavformat/framecrcenc.c')
0 files changed, 0 insertions, 0 deletions