diff options
| author | Miguel Freitas <miguelfreitas@users.sourceforge.net> | 2003-03-26 14:43:46 +0000 |
|---|---|---|
| committer | Miguel Freitas <miguelfreitas@users.sourceforge.net> | 2003-03-26 14:43:46 +0000 |
| commit | a5adaebc130805962f83deccb29f47a7a2384fc8 (patch) | |
| tree | 50ce22f99ced67b6d975632574ce4b392ed820ad /src/libffmpeg/libavcodec/wmadec.c | |
| parent | 689bd7704fde776152e6883ce1b6022ec638304b (diff) | |
| download | xine-lib-a5adaebc130805962f83deccb29f47a7a2384fc8.tar.gz xine-lib-a5adaebc130805962f83deccb29f47a7a2384fc8.tar.bz2 | |
update ffmpeg. trying to keep local changes (see diff_to_ffmpeg_cvs.txt), let me
know if i overlooked something.
as usual, preliminary QA: tested non debug builds and several codecs including
divx3/4/5, mpeg4, xvid, msmpeg4v3, svq1, wmv7, dv (video/audio), wma
i also enabled wmv8 by default since it worked fine with the streams i have. i'm not
sure about current state of that so we might enable it only for non-x86 users in
case of trouble.
CVS patchset: 4488
CVS date: 2003/03/26 14:43:46
Diffstat (limited to 'src/libffmpeg/libavcodec/wmadec.c')
| -rw-r--r-- | src/libffmpeg/libavcodec/wmadec.c | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/src/libffmpeg/libavcodec/wmadec.c b/src/libffmpeg/libavcodec/wmadec.c index 5305e1c5d..ab02feb72 100644 --- a/src/libffmpeg/libavcodec/wmadec.c +++ b/src/libffmpeg/libavcodec/wmadec.c @@ -16,6 +16,12 @@ * License along with this library; if not, write to the Free Software * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ + +/** + * @file wmadec.c + * WMA compatible decoder. + */ + #include "avcodec.h" #include "dsputil.h" @@ -1215,7 +1221,7 @@ static int wma_decode_frame(WMADecodeContext *s, int16_t *samples) static int wma_decode_superframe(AVCodecContext *avctx, void *data, int *data_size, - UINT8 *buf, int buf_size) + uint8_t *buf, int buf_size) { WMADecodeContext *s = avctx->priv_data; int nb_frames, bit_offset, i, pos, len; |