[FFmpeg-cvslog] r17048 - in trunk: ffmpeg.c ffplay.c ffserver.c libavformat/mov.c libavformat/utils.c output_example.c tests/seek_test.c

[stefano]

Author: stefano
Date: Sun Feb  8 09:27:26 2009
New Revision: 17048

Log:
Replace the calls to the deprecated av_alloc_format_context() with
corresponding calls to avformat_alloc_context().

Modified:
   trunk/ffmpeg.c
   trunk/ffplay.c
   trunk/ffserver.c
   trunk/libavformat/mov.c
   trunk/libavformat/utils.c
   trunk/output_example.c
   trunk/tests/seek_test.c

Modified: trunk/ffmpeg.c
==============================================================================
--- trunk/ffmpeg.c	Sun Feb  8 09:16:40 2009	(r17047)
+++ trunk/ffmpeg.c	Sun Feb  8 09:27:26 2009	(r17048)
@@ -2778,7 +2778,7 @@ static void opt_input_file(const char *f
                     !strcmp(filename, "/dev/stdin");
 
     /* get default parameters from command line */
-    ic = av_alloc_format_context();
+    ic = avformat_alloc_context();
 
     memset(ap, 0, sizeof(*ap));
     ap->prealloced_context = 1;
@@ -3267,7 +3267,7 @@ static void opt_output_file(const char *
     if (!strcmp(filename, "-"))
         filename = "pipe:";
 
-    oc = av_alloc_format_context();
+    oc = avformat_alloc_context();
 
     if (!file_oformat) {
         file_oformat = guess_format(NULL, filename, NULL);
@@ -3900,7 +3900,7 @@ int main(int argc, char **argv)
     for(i=0; i<CODEC_TYPE_NB; i++){
         avctx_opts[i]= avcodec_alloc_context2(i);
     }
-    avformat_opts = av_alloc_format_context();
+    avformat_opts = avformat_alloc_context();
     sws_opts = sws_getContext(16,16,0, 16,16,0, sws_flags, NULL,NULL,NULL);
 
     show_banner();

Modified: trunk/ffplay.c
==============================================================================
--- trunk/ffplay.c	Sun Feb  8 09:16:40 2009	(r17047)
+++ trunk/ffplay.c	Sun Feb  8 09:27:26 2009	(r17048)
@@ -2554,7 +2554,7 @@ int main(int argc, char **argv)
     for(i=0; i<CODEC_TYPE_NB; i++){
         avctx_opts[i]= avcodec_alloc_context2(i);
     }
-    avformat_opts = av_alloc_format_context();
+    avformat_opts = avformat_alloc_context();
     sws_opts = sws_getContext(16,16,0, 16,16,0, sws_flags, NULL,NULL,NULL);
 
     show_banner();

Modified: trunk/ffserver.c
==============================================================================
--- trunk/ffserver.c	Sun Feb  8 09:16:40 2009	(r17047)
+++ trunk/ffserver.c	Sun Feb  8 09:27:26 2009	(r17048)
@@ -2711,7 +2711,7 @@ static int prepare_sdp_description(FFStr
     AVStream avs[MAX_STREAMS];
     int i;
 
-    avc =  av_alloc_format_context();
+    avc =  avformat_alloc_context();
     if (avc == NULL) {
         return -1;
     }
@@ -3154,7 +3154,7 @@ static int rtp_new_av_stream(HTTPContext
     int max_packet_size;
 
     /* now we can open the relevant output stream */
-    ctx = av_alloc_format_context();
+    ctx = avformat_alloc_context();
     if (!ctx)
         return -1;
     ctx->oformat = guess_format("rtp", NULL, NULL);

Modified: trunk/libavformat/mov.c
==============================================================================
--- trunk/libavformat/mov.c	Sun Feb  8 09:16:40 2009	(r17047)
+++ trunk/libavformat/mov.c	Sun Feb  8 09:27:26 2009	(r17048)
@@ -1009,7 +1009,7 @@ static int mov_read_stsd(MOVContext *c, 
     switch (st->codec->codec_id) {
 #if CONFIG_DV_DEMUXER
     case CODEC_ID_DVAUDIO:
-        c->dv_fctx = av_alloc_format_context();
+        c->dv_fctx = avformat_alloc_context();
         c->dv_demux = dv_init_demux(c->dv_fctx);
         if (!c->dv_demux) {
             av_log(c->fc, AV_LOG_ERROR, "dv demux context init error\n");

Modified: trunk/libavformat/utils.c
==============================================================================
--- trunk/libavformat/utils.c	Sun Feb  8 09:16:40 2009	(r17047)
+++ trunk/libavformat/utils.c	Sun Feb  8 09:27:26 2009	(r17048)
@@ -413,7 +413,7 @@ int av_open_input_stream(AVFormatContext
     }
 
     if(!ap->prealloced_context)
-        ic = av_alloc_format_context();
+        ic = avformat_alloc_context();
     else
         ic = *ic_ptr;
     if (!ic) {

Modified: trunk/output_example.c
==============================================================================
--- trunk/output_example.c	Sun Feb  8 09:16:40 2009	(r17047)
+++ trunk/output_example.c	Sun Feb  8 09:27:26 2009	(r17048)
@@ -453,7 +453,7 @@ int main(int argc, char **argv)
     }
 
     /* allocate the output media context */
-    oc = av_alloc_format_context();
+    oc = avformat_alloc_context();
     if (!oc) {
         fprintf(stderr, "Memory error\n");
         exit(1);

Modified: trunk/tests/seek_test.c
==============================================================================
--- trunk/tests/seek_test.c	Sun Feb  8 09:16:40 2009	(r17047)
+++ trunk/tests/seek_test.c	Sun Feb  8 09:27:26 2009	(r17048)
@@ -50,7 +50,7 @@ int main(int argc, char **argv)
     filename = argv[1];
 
     /* allocate the media context */
-    ic = av_alloc_format_context();
+    ic = avformat_alloc_context();
     if (!ic) {
         fprintf(stderr, "Memory error\n");
         exit(1);