summaryrefslogtreecommitdiff
path: root/libavformat/utils.c
diff options
context:
space:
mode:
authorMåns Rullgård <mans@mansr.com>2006-07-09 23:40:53 +0000
committerMåns Rullgård <mans@mansr.com>2006-07-09 23:40:53 +0000
commitd2a067d1d9011bf1015fd23efcbfb20cd4f79e1a (patch)
tree859e011692e235fd60c89e25caea93c7e2d87fad /libavformat/utils.c
parent21227514de650da3de297acce893175230f04beb (diff)
give AVInput/OutputFormat structs consistent names
Originally committed as revision 5697 to svn://svn.ffmpeg.org/ffmpeg/trunk
Diffstat (limited to 'libavformat/utils.c')
-rw-r--r--libavformat/utils.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/libavformat/utils.c b/libavformat/utils.c
index f5598e57d7..6d550a09e8 100644
--- a/libavformat/utils.c
+++ b/libavformat/utils.c
@@ -599,7 +599,7 @@ int av_open_input_file(AVFormatContext **ic_ptr, const char *filename,
/* XXX: suppress this hack for redirectors */
#ifdef CONFIG_NETWORK
- if (fmt == &redir_demux) {
+ if (fmt == &redir_demuxer) {
err = redir_open(ic_ptr, pb);
url_fclose(pb);
return err;
@@ -1730,7 +1730,7 @@ static void av_estimate_timings(AVFormatContext *ic)
}
ic->file_size = file_size;
- if ((ic->iformat == &mpegps_demux || ic->iformat == &mpegts_demux) && file_size && !ic->pb.is_streamed) {
+ if ((ic->iformat == &mpegps_demuxer || ic->iformat == &mpegts_demuxer) && file_size && !ic->pb.is_streamed) {
/* get accurate estimate from the PTSes */
av_estimate_timings_from_pts(ic);
} else if (av_has_timings(ic)) {