diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2015-01-27 18:02:42 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2015-01-27 18:03:43 +0100 |
| commit | 62a82c66cd3f03e045867471c5edcc84b4d2b54e (patch) | |
| tree | ed8a8d99a235f959088b28fe131c6c4e5fcbe610 /libavformat | |
| parent | b44456c908965231160f9b8f88de8c0dc447aa1f (diff) | |
| parent | 728685f37ab333ca35980bd01766c78d197f784a (diff) | |
| download | ffmpeg-62a82c66cd3f03e045867471c5edcc84b4d2b54e.tar.gz | |
Merge commit '728685f37ab333ca35980bd01766c78d197f784a'
* commit '728685f37ab333ca35980bd01766c78d197f784a':
Add a side data type for audio service type.
Conflicts:
doc/APIchanges
libavcodec/avcodec.h
libavcodec/version.h
libavutil/frame.h
libavutil/version.h
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavformat')
0 files changed, 0 insertions, 0 deletions