diff options
| author | XhmikosR <xhmikosr@users.sourceforge.net> | 2010-07-01 17:37:42 +0400 |
|---|---|---|
| committer | XhmikosR <xhmikosr@users.sourceforge.net> | 2010-07-01 17:37:42 +0400 |
| commit | 6cbb04ca0bd4d7feba3e510187231a7065153149 (patch) | |
| tree | 04c24c00094d70d7f5d819f46169def6e153b629 /src/filters/transform/MPCVideoDec/ffmpeg/libavcodec/mlpdec.c | |
| parent | 2fa91881376e2755415efcb52973a3fa482c2e97 (diff) | |
updated ffmpeg
git-svn-id: https://mpc-hc.svn.sourceforge.net/svnroot/mpc-hc/trunk@2092 10f7b99b-c216-0410-bff0-8a66a9350fd8
Diffstat (limited to 'src/filters/transform/MPCVideoDec/ffmpeg/libavcodec/mlpdec.c')
| -rw-r--r-- | src/filters/transform/MPCVideoDec/ffmpeg/libavcodec/mlpdec.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/filters/transform/MPCVideoDec/ffmpeg/libavcodec/mlpdec.c b/src/filters/transform/MPCVideoDec/ffmpeg/libavcodec/mlpdec.c index fa5b62086..e392d971b 100644 --- a/src/filters/transform/MPCVideoDec/ffmpeg/libavcodec/mlpdec.c +++ b/src/filters/transform/MPCVideoDec/ffmpeg/libavcodec/mlpdec.c @@ -939,8 +939,8 @@ static int output_data(MLPDecodeContext *m, unsigned int substr, /** Read an access unit from the stream. - * Returns < 0 on error, 0 if not enough data is present in the input stream - * otherwise returns the number of bytes consumed. */ + * @return negative on error, 0 if not enough data is present in the input stream, + * otherwise the number of bytes consumed. */ static int read_access_unit(AVCodecContext *avctx, void* data, int *data_size, const uint8_t *buf, int buf_size) @@ -1139,7 +1139,7 @@ error: AVCodec mlp_decoder = { "mlp", - CODEC_TYPE_AUDIO, + AVMEDIA_TYPE_AUDIO, CODEC_ID_MLP, sizeof(MLPDecodeContext), /*.init = */mlp_decode_init, @@ -1157,7 +1157,7 @@ AVCodec mlp_decoder = { #if CONFIG_TRUEHD_DECODER AVCodec truehd_decoder = { "truehd", - CODEC_TYPE_AUDIO, + AVMEDIA_TYPE_AUDIO, CODEC_ID_TRUEHD, sizeof(MLPDecodeContext), /*.init = */mlp_decode_init, |