diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2015-02-17 20:18:19 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2015-02-17 20:18:19 +0100 |
| commit | d2668ae472690fe102b7c63fbddd716ebca25dd3 (patch) | |
| tree | 51af2a0dff0e63e0b2e6e4204664e3cd0e45ab0b /libavcodec/dca.h | |
| parent | 03dab49a1267630375c4fc15dec1136814b1f117 (diff) | |
| parent | f8c1719771dc4ac2e13e6bc8bf741854a30e3a86 (diff) | |
| download | ffmpeg-d2668ae472690fe102b7c63fbddd716ebca25dd3.tar.gz | |
Merge commit 'f8c1719771dc4ac2e13e6bc8bf741854a30e3a86'
* commit 'f8c1719771dc4ac2e13e6bc8bf741854a30e3a86':
dca: Remove separate header for DCA ExSS
Conflicts:
libavcodec/dca.h
libavcodec/dca_exss.h
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/dca.h')
| -rw-r--r-- | libavcodec/dca.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/libavcodec/dca.h b/libavcodec/dca.h index b752bc3fdb..6078b2e846 100644 --- a/libavcodec/dca.h +++ b/libavcodec/dca.h @@ -213,4 +213,6 @@ int avpriv_dca_convert_bitstream(const uint8_t *src, int src_size, uint8_t *dst, int ff_dca_xbr_parse_frame(DCAContext *s); int ff_dca_xxch_decode_frame(DCAContext *s); +void ff_dca_exss_parse_header(DCAContext *s); + #endif /* AVCODEC_DCA_H */ |