diff options
| author | Spec-Chum <spec-chum@users.sourceforge.net> | 2010-06-28 13:52:29 +0400 |
|---|---|---|
| committer | Spec-Chum <spec-chum@users.sourceforge.net> | 2010-06-28 13:52:29 +0400 |
| commit | d689241854077b6efc7a62f0e4f5b3bd414228e6 (patch) | |
| tree | 8bc1c3300a160572b01845c5cabf01f59424030a /src/filters/transform/MPCVideoDec/ffmpeg/libavcodec/adpcm.c | |
| parent | 4a0275d8a6340469646ef0e07fe8121875051ad0 (diff) | |
Updated ffmpeg (patch by XhmikosR) - Unresolved externals fixed by Spec-Chum
git-svn-id: https://mpc-hc.svn.sourceforge.net/svnroot/mpc-hc/trunk@2082 10f7b99b-c216-0410-bff0-8a66a9350fd8
Diffstat (limited to 'src/filters/transform/MPCVideoDec/ffmpeg/libavcodec/adpcm.c')
| -rw-r--r-- | src/filters/transform/MPCVideoDec/ffmpeg/libavcodec/adpcm.c | 22 |
1 files changed, 19 insertions, 3 deletions
diff --git a/src/filters/transform/MPCVideoDec/ffmpeg/libavcodec/adpcm.c b/src/filters/transform/MPCVideoDec/ffmpeg/libavcodec/adpcm.c index 365da9cbb..6fda2f8bf 100644 --- a/src/filters/transform/MPCVideoDec/ffmpeg/libavcodec/adpcm.c +++ b/src/filters/transform/MPCVideoDec/ffmpeg/libavcodec/adpcm.c @@ -24,7 +24,7 @@ #include "bytestream.h"
/**
- * @file libavcodec/adpcm.c
+ * @file
* ADPCM codecs.
* First version by Francois Revol (revol@free.fr)
* Fringe ADPCM codecs (e.g., DK3, DK4, Westwood)
@@ -139,8 +139,24 @@ typedef struct ADPCMChannelStatus { int idelta;
} ADPCMChannelStatus;
+typedef struct TrellisPath {
+ int nibble;
+ int prev;
+} TrellisPath;
+
+typedef struct TrellisNode {
+ uint32_t ssd;
+ int path;
+ int sample1;
+ int sample2;
+ int step;
+} TrellisNode;
+
typedef struct ADPCMContext {
- ADPCMChannelStatus status[2];
+ ADPCMChannelStatus status[6];
+ TrellisPath *paths;
+ TrellisNode *node_buf;
+ TrellisNode **nodep_buf;
} ADPCMContext;
static av_cold int adpcm_decode_init(AVCodecContext * avctx)
@@ -843,7 +859,7 @@ static int adpcm_decode_frame(AVCodecContext *avctx, #define ADPCM_DECODER(id,name,long_name_) \
AVCodec name ## _decoder = { \
#name, \
- CODEC_TYPE_AUDIO, \
+ AVMEDIA_TYPE_AUDIO, \
id, \
sizeof(ADPCMContext), \
adpcm_decode_init, \
|