diff options
| author | Michael Niedermayer <michael@niedermayer.cc> | 2015-07-23 18:01:49 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michael@niedermayer.cc> | 2015-07-23 18:43:59 +0200 |
| commit | cb59d29fd6b9472cd6aa29370208e59b63fe3678 (patch) | |
| tree | 8f319b8915b10dc42a6b96f6b1e537cc6efd9852 /libavformat/samidec.c | |
| parent | efa1e26122e3ae68dfd1c4ff622aa2060d4a80c3 (diff) | |
| parent | 11f3d5c69b711a1f1631961921ecd20d31f8336d (diff) | |
| download | ffmpeg-cb59d29fd6b9472cd6aa29370208e59b63fe3678.tar.gz | |
Merge commit '11f3d5c69b711a1f1631961921ecd20d31f8336d'
* commit '11f3d5c69b711a1f1631961921ecd20d31f8336d':
hap: Name enums, remove unused struct member
Conflicts:
libavcodec/hap.h
See: 440c26e9c46bb26bc1fc8306561ed6962ae7d3bf
See: d8488090e5070187e9d8d0a93b8d841f26bde990
Merged-by: Michael Niedermayer <michael@niedermayer.cc>
Diffstat (limited to 'libavformat/samidec.c')
0 files changed, 0 insertions, 0 deletions