Mercurial > mplayer.hg

comparison libmpdemux/demux_lavf.c @ 17569:6c541a8421ca

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Reverse commit of unfinished patch for passing audio_delay to the demuxers.
author corey
date Thu, 09 Feb 2006 19:39:51 +0000
parents e3f1229395b1
children b849a99cdc3c
comparison
equal deleted inserted replaced
17568:2275417ad349 17569:6c541a8421ca
387 // append packet to DS stream: 387 // append packet to DS stream:
388 ds_add_packet(ds,dp); 388 ds_add_packet(ds,dp);
389 return 1; 389 return 1;
390 } 390 }
391 391
392 static void demux_seek_lavf(demuxer_t *demuxer, float rel_seek_secs, float audio_delay, int flags){ 392 static void demux_seek_lavf(demuxer_t *demuxer, float rel_seek_secs, int flags){
393 lavf_priv_t *priv = demuxer->priv; 393 lavf_priv_t *priv = demuxer->priv;
394 mp_msg(MSGT_DEMUX,MSGL_DBG2,"demux_seek_lavf(%p, %f, %f, %d)\n", demuxer, rel_seek_secs, audio_delay, flags); 394 mp_msg(MSGT_DEMUX,MSGL_DBG2,"demux_seek_lavf(%p, %f, %d)\n", demuxer, rel_seek_secs, flags);
395 395
396 #if LIBAVFORMAT_BUILD < 4619 396 #if LIBAVFORMAT_BUILD < 4619
397 av_seek_frame(priv->avfc, -1, priv->last_pts + rel_seek_secs*AV_TIME_BASE); 397 av_seek_frame(priv->avfc, -1, priv->last_pts + rel_seek_secs*AV_TIME_BASE);
398 #else 398 #else
399 av_seek_frame(priv->avfc, -1, priv->last_pts + rel_seek_secs*AV_TIME_BASE, rel_seek_secs < 0 ? AVSEEK_FLAG_BACKWARD : 0); 399 av_seek_frame(priv->avfc, -1, priv->last_pts + rel_seek_secs*AV_TIME_BASE, rel_seek_secs < 0 ? AVSEEK_FLAG_BACKWARD : 0);