Mercurial > mplayer.hg
comparison libmpdemux/demux_lavf.c @ 33871:30f5e5cd3676
Move code for setting up libav* logging callbacks from vd_ffmpeg to a
separate file and also use it when only initializing libavformat.
| author | reimar |
|---|---|
| date | Tue, 09 Aug 2011 19:57:00 +0000 |
| parents | 3348a9e99214 |
| children | 82b5070214cc |
comparison
equal
deleted
inserted
replaced
| 33870:15e182c07689 | 33871:30f5e5cd3676 |
|---|---|
| 25 | 25 |
| 26 #include "config.h" | 26 #include "config.h" |
| 27 #include "mp_msg.h" | 27 #include "mp_msg.h" |
| 28 #include "help_mp.h" | 28 #include "help_mp.h" |
| 29 #include "av_opts.h" | 29 #include "av_opts.h" |
| 30 #include "av_helpers.h" | |
| 30 | 31 |
| 31 #include "stream/stream.h" | 32 #include "stream/stream.h" |
| 32 #include "aviprint.h" | 33 #include "aviprint.h" |
| 33 #include "demuxer.h" | 34 #include "demuxer.h" |
| 34 #include "stheader.h" | 35 #include "stheader.h" |
| 152 | 153 |
| 153 if(!demuxer->priv) | 154 if(!demuxer->priv) |
| 154 demuxer->priv=calloc(sizeof(lavf_priv_t),1); | 155 demuxer->priv=calloc(sizeof(lavf_priv_t),1); |
| 155 priv= demuxer->priv; | 156 priv= demuxer->priv; |
| 156 | 157 |
| 157 av_register_all(); | 158 init_avformat(); |
| 158 | 159 |
| 159 if (opt_format) { | 160 if (opt_format) { |
| 160 if (strcmp(opt_format, "help") == 0) { | 161 if (strcmp(opt_format, "help") == 0) { |
| 161 list_formats(); | 162 list_formats(); |
| 162 return 0; | 163 return 0; |