[FFmpeg-cvslog] r21550 - in trunk: ffmpeg.c ffplay.c libavfilter/vf_format.c

[stefano]

Author: stefano
Date: Sat Jan 30 20:10:26 2010
New Revision: 21550

Log:
Use av_get_pix_fmt() instead of the deprecated avcodec_get_pix_fmt()
function.

Modified:
   trunk/ffmpeg.c
   trunk/ffplay.c
   trunk/libavfilter/vf_format.c

Modified: trunk/ffmpeg.c
==============================================================================
--- trunk/ffmpeg.c	Sat Jan 30 20:03:37 2010	(r21549)
+++ trunk/ffmpeg.c	Sat Jan 30 20:10:26 2010	(r21550)
@@ -38,6 +38,7 @@
 #include "libavcodec/audioconvert.h"
 #include "libavcodec/colorspace.h"
 #include "libavutil/fifo.h"
+#include "libavutil/pixdesc.h"
 #include "libavutil/avstring.h"
 #include "libavformat/os_support.h"
 
@@ -2581,7 +2582,7 @@ static void opt_frame_pad_right(const ch
 static void opt_frame_pix_fmt(const char *arg)
 {
     if (strcmp(arg, "list")) {
-        frame_pix_fmt = avcodec_get_pix_fmt(arg);
+        frame_pix_fmt = av_get_pix_fmt(arg);
         if (frame_pix_fmt == PIX_FMT_NONE) {
             fprintf(stderr, "Unknown pixel format requested: %s\n", arg);
             av_exit(1);

Modified: trunk/ffplay.c
==============================================================================
--- trunk/ffplay.c	Sat Jan 30 20:03:37 2010	(r21549)
+++ trunk/ffplay.c	Sat Jan 30 20:10:26 2010	(r21550)
@@ -23,6 +23,7 @@
 #include <math.h>
 #include <limits.h>
 #include "libavutil/avstring.h"
+#include "libavutil/pixdesc.h"
 #include "libavformat/avformat.h"
 #include "libavdevice/avdevice.h"
 #include "libswscale/swscale.h"
@@ -2406,7 +2407,7 @@ static void opt_format(const char *arg)
 
 static void opt_frame_pix_fmt(const char *arg)
 {
-    frame_pix_fmt = avcodec_get_pix_fmt(arg);
+    frame_pix_fmt = av_get_pix_fmt(arg);
 }
 
 static int opt_sync(const char *opt, const char *arg)

Modified: trunk/libavfilter/vf_format.c
==============================================================================
--- trunk/libavfilter/vf_format.c	Sat Jan 30 20:03:37 2010	(r21549)
+++ trunk/libavfilter/vf_format.c	Sat Jan 30 20:10:26 2010	(r21550)
@@ -23,6 +23,7 @@
  * format and noformat video filters
  */
 
+#include "libavutil/pixdesc.h"
 #include "avfilter.h"
 
 typedef struct {
@@ -56,7 +57,7 @@ static av_cold int init(AVFilterContext 
 
         memcpy(pix_fmt_name, cur, pix_fmt_name_len);
         pix_fmt_name[pix_fmt_name_len] = 0;
-        pix_fmt = avcodec_get_pix_fmt(pix_fmt_name);
+        pix_fmt = av_get_pix_fmt(pix_fmt_name);
 
         if (pix_fmt == PIX_FMT_NONE) {
             av_log(ctx, AV_LOG_ERROR, "Unknown pixel format: %s\n", pix_fmt_name);