Mercurial > libavformat.hg

diff utils.c @ 1167:d89d7ef290da libavformat

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
give AVInput/OutputFormat structs consistent names
author mru
date Sun, 09 Jul 2006 23:40:53 +0000
parents c10e0dbce7de
children d18cc9a1fd02
line wrap: on
line diff
--- a/utils.c	Sun Jul 09 10:33:49 2006 +0000
+++ b/utils.c	Sun Jul 09 23:40:53 2006 +0000
@@ -599,7 +599,7 @@
 
     /* 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 @@
     }
     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)) {