RepoMirrors
/
mpv
mirror of https://github.com/mpv-player/mpv
1
0
Fork 0
Code Issues Releases Wiki Activity

Bring (de)muxer_lavf up to date with the libavformat API changes introduced by FFmpeg commit r11071. 

Patch for demuxer_lavf.c by Chris Welton - electrostatic_1 at yahoo
Patch for muxer_lavf.c by me.
Approved by michaelni.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@25145 b3059339-0415-0410-9bf9-f77b7e298cf2
This commit is contained in:
iive 2007-11-23 10:44:33 +00:00
parent 5b1720b92b
commit 958c41d9b6
2 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
libmpdemux/demux_lavf.c
View File

@ -64,7 +64,7 @@ m_option_t lavfdopts_conf[] = {
typedef struct lavf_priv_t{ typedef struct lavf_priv_t{
AVInputFormat *avif; AVInputFormat *avif;
AVFormatContext *avfc; AVFormatContext *avfc;
ByteIOContext pb; ByteIOContext *pb;
int audio_streams; int audio_streams;
int video_streams; int video_streams;
int sub_streams; int sub_streams;
@ -471,9 +471,9 @@ static demuxer_t* demux_open_lavf(demuxer_t *demuxer){
url_fopen(&priv->pb, mp_filename, URL_RDONLY); url_fopen(&priv->pb, mp_filename, URL_RDONLY);
((URLContext*)(priv->pb.opaque))->priv_data= demuxer->stream; ((URLContext*)(priv->pb->opaque))->priv_data= demuxer->stream;
if(av_open_input_stream(&avfc, &priv->pb, mp_filename, priv->avif, &ap)<0){ if(av_open_input_stream(&avfc, priv->pb, mp_filename, priv->avif, &ap)<0){
mp_msg(MSGT_HEADER,MSGL_ERR,"LAVF_header: av_open_input_stream() failed\n"); mp_msg(MSGT_HEADER,MSGL_ERR,"LAVF_header: av_open_input_stream() failed\n");
return NULL; return NULL;
} }

4
libmpdemux/muxer_lavf.c
View File

@ -40,7 +40,7 @@ extern char *info_comment;
typedef struct { typedef struct {
//AVInputFormat *avif; //AVInputFormat *avif;
AVFormatContext *oc; AVFormatContext *oc;
ByteIOContext pb; ByteIOContext *pb;
int audio_streams; int audio_streams;
int video_streams; int video_streams;
int64_t last_pts; int64_t last_pts;
@ -317,7 +317,7 @@ static void write_trailer(muxer_t *muxer)
av_freep(&(priv->oc->streams[i])); av_freep(&(priv->oc->streams[i]));
} }
url_fclose(&(priv->oc->pb)); url_fclose(priv->oc->pb);
av_free(priv->oc); av_free(priv->oc);
} }