Mercurial > mplayer.hg

comparison libmpdemux/demux_lavf.c @ 33608:3348a9e99214

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Indentation fixes.
author reimar
date Tue, 21 Jun 2011 20:29:55 +0000
parents a761fc66ddc7
children 30f5e5cd3676
comparison
equal deleted inserted replaced
33607:a761fc66ddc7 33608:3348a9e99214
528 av_strlcat(mp_filename, demuxer->stream->url, sizeof(mp_filename)); 528 av_strlcat(mp_filename, demuxer->stream->url, sizeof(mp_filename));
529 } else 529 } else
530 av_strlcat(mp_filename, "foobar.dummy", sizeof(mp_filename)); 530 av_strlcat(mp_filename, "foobar.dummy", sizeof(mp_filename));
531 531
532 if (!(priv->avif->flags & AVFMT_NOFILE)) { 532 if (!(priv->avif->flags & AVFMT_NOFILE)) {
533 priv->pb = av_alloc_put_byte(priv->buffer, BIO_BUFFER_SIZE, 0, 533 priv->pb = av_alloc_put_byte(priv->buffer, BIO_BUFFER_SIZE, 0,
534 demuxer, mp_read, NULL, mp_seek); 534 demuxer, mp_read, NULL, mp_seek);
535 priv->pb->read_seek = mp_read_seek; 535 priv->pb->read_seek = mp_read_seek;
536 priv->pb->is_streamed = !demuxer->stream->end_pos || (demuxer->stream->flags & MP_STREAM_SEEK) != MP_STREAM_SEEK; 536 priv->pb->is_streamed = !demuxer->stream->end_pos || (demuxer->stream->flags & MP_STREAM_SEEK) != MP_STREAM_SEEK;
537 } 537 }
538 538
539 if(av_open_input_stream(&avfc, priv->pb, mp_filename, priv->avif, &ap)<0){ 539 if(av_open_input_stream(&avfc, priv->pb, mp_filename, priv->avif, &ap)<0){
540 mp_msg(MSGT_HEADER,MSGL_ERR,"LAVF_header: av_open_input_stream() failed\n"); 540 mp_msg(MSGT_HEADER,MSGL_ERR,"LAVF_header: av_open_input_stream() failed\n");
541 return NULL; 541 return NULL;
838 static void demux_close_lavf(demuxer_t *demuxer) 838 static void demux_close_lavf(demuxer_t *demuxer)
839 { 839 {
840 lavf_priv_t* priv = demuxer->priv; 840 lavf_priv_t* priv = demuxer->priv;
841 if (priv){ 841 if (priv){
842 if(priv->avfc) 842 if(priv->avfc)
843 { 843 {
844 av_freep(&priv->avfc->key); 844 av_freep(&priv->avfc->key);
845 av_close_input_stream(priv->avfc); 845 av_close_input_stream(priv->avfc);
846 } 846 }
847 av_freep(&priv->pb); 847 av_freep(&priv->pb);
848 free(priv); demuxer->priv= NULL; 848 free(priv); demuxer->priv= NULL;