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/dcadec.c | |
| parent | 03dab49a1267630375c4fc15dec1136814b1f117 (diff) | |
| parent | f8c1719771dc4ac2e13e6bc8bf741854a30e3a86 (diff) | |
| download | ffmpeg-streaming-d2668ae472690fe102b7c63fbddd716ebca25dd3.zip ffmpeg-streaming-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/dcadec.c')
| -rw-r--r-- | libavcodec/dcadec.c | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/libavcodec/dcadec.c b/libavcodec/dcadec.c index 1383045..bb15049 100644 --- a/libavcodec/dcadec.c +++ b/libavcodec/dcadec.c @@ -40,7 +40,6 @@ #include "dcadata.h" #include "dcadsp.h" #include "dcahuff.h" -#include "dca_exss.h" #include "fft.h" #include "fmtconvert.h" #include "get_bits.h" |
