diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-03-28 11:11:00 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-03-28 11:18:23 +0100 |
| commit | b1064dd783b25b80ec0790876877bc886c2ec449 (patch) | |
| tree | 23481a59a22165e21b6926bc6d096b0a47b1cd50 /libavcodec/dcadec.c | |
| parent | 7609d42d0f4682ccccbebe0c70613af189134a33 (diff) | |
| parent | 1db6a080bddd14fed6b29140ecd2e21e42b1c022 (diff) | |
Merge commit '1db6a080bddd14fed6b29140ecd2e21e42b1c022'
* commit '1db6a080bddd14fed6b29140ecd2e21e42b1c022':
dca: Move ff_dca_convert_bitstream() to the DCA common code
vdpau: wrap codec specific functions in appropiate #ifs
Conflicts:
libavcodec/Makefile
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 cf4412c5cc..8265c0fb38 100644 --- a/libavcodec/dcadec.c +++ b/libavcodec/dcadec.c @@ -40,7 +40,6 @@ #include "dcadata.h" #include "dcahuff.h" #include "dca.h" -#include "dca_parser.h" #include "mathops.h" #include "synth_filter.h" #include "dcadsp.h" |