ffplay: rename output_picture2() to output_picture()
authorStefano Sabatini <stefano.sabatini-lala@poste.it>
Sun, 2 May 2010 22:03:49 +0000 (00:03 +0200)
committerStefano Sabatini <stefano.sabatini-lala@poste.it>
Mon, 11 Apr 2011 23:37:00 +0000 (01:37 +0200)
The "2" suffix is confusing.

Signed-off-by: Stefano Sabatini <stefano.sabatini-lala@poste.it>
ffplay.c

index 350dcf3..41a2bbc 100644 (file)
--- a/ffplay.c
+++ b/ffplay.c
@@ -1478,7 +1478,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;
 
@@ -1859,9 +1859,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)