wrapper/FFmpeg
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge commit 'f5d2c597e9'

Browse source 
* commit 'f5d2c597e9':
  build: fix library installation on cygwin
  mpc8: add a flush function
  mpc8: set packet duration and stream start time instead of tracking frames

Conflicts:
	libavformat/mpc8.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
This commit is contained in:
Michael Niedermayer 2012-08-07 21:49:00 +02:00
commit bc773d0d42
3 changed files with 14 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

7
libavcodec/mpc8.c
View file

@ -428,6 +428,12 @@ static int mpc8_decode_frame(AVCodecContext * avctx, void *data,
return c->cur_frame ? c->last_bits_used >> 3 : buf_size;
}
static av_cold void mpc8_decode_flush(AVCodecContext *avctx)
{
MPCContext *c = avctx->priv_data;
c->cur_frame = 0;
}
AVCodec ff_mpc8_decoder = {
.name = "mpc8",
.type = AVMEDIA_TYPE_AUDIO,
@ -435,6 +441,7 @@ AVCodec ff_mpc8_decoder = {
.priv_data_size = sizeof(MPCContext),
.init = mpc8_decode_init,
.decode = mpc8_decode_frame,
.flush = mpc8_decode_flush,
.capabilities = CODEC_CAP_DR1,
.long_name = NULL_IF_CONFIG_SMALL("Musepack SV8"),
};