diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2015-03-04 19:24:12 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2015-03-04 19:28:53 +0100 |
| commit | 87db7e777262a7800cc6c76e07870f7a8f6301ed (patch) | |
| tree | a9ddb30c4f4408ba8a136f13c84d322ba9ea79b6 /libavformat/iff.c | |
| parent | 634ce8ddad6b2c03d24bce12ba69f9217729d3f5 (diff) | |
| parent | 25f613f8be3b51e4396b93cda131e4631ba54302 (diff) | |
| download | ffmpeg-87db7e777262a7800cc6c76e07870f7a8f6301ed.tar.gz | |
Merge commit '25f613f8be3b51e4396b93cda131e4631ba54302'
* commit '25f613f8be3b51e4396b93cda131e4631ba54302':
dca: Move syncword definitions to a separate header
Conflicts:
libavcodec/dca_parser.c
libavformat/dtsdec.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavformat/iff.c')
0 files changed, 0 insertions, 0 deletions