[FFmpeg-devel] [PATCH] ffplay: rename output_picture2() to output_picture()

Stefano Sabatini stefano.sabatini-lala at poste.it
Mon Apr 11 11:14:00 CEST 2011


The "2" suffix is confusing.

Signed-off-by: Stefano Sabatini <stefano.sabatini-lala at poste.it>
---
 ffplay.c |    6 +++---
 1 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/ffplay.c b/ffplay.c
index b4df7c4..ea362e4 100644
--- a/ffplay.c
+++ b/ffplay.c
@@ -1469,7 +1469,7 @@ static int queue_picture(VideoState *is, AVFrame *src_frame, double pts, int64_t
  * compute the exact PTS for the picture if it is omitted in the stream
  * @param pts1 the dts of the pkt / pts of the frame
  */
-static int output_picture2(VideoState *is, AVFrame *src_frame, double pts1, int64_t pos)
+static int output_picture(VideoState *is, AVFrame *src_frame, double pts1, int64_t pos)
 {
     double frame_delay, pts;
 
@@ -1850,9 +1850,9 @@ static int video_thread(void *arg)
         pts = pts_int*av_q2d(is->video_st->time_base);
 
 #if CONFIG_AVFILTER
-        ret = output_picture2(is, frame, pts, pos);
+        ret = output_picture(is, frame, pts, pos);
 #else
-        ret = output_picture2(is, frame, pts,  pkt.pos);
+        ret = output_picture(is, frame, pts,  pkt.pos);
         av_free_packet(&pkt);
 #endif
         if (ret < 0)
-- 
1.7.2.3



More information about the ffmpeg-devel mailing list