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

Stefano Sabatini git at videolan.org
Tue Apr 12 01:45:21 CEST 2011


ffmpeg | branch: master | Stefano Sabatini <stefano.sabatini-lala at poste.it> | Mon May  3 00:03:49 2010 +0200| [3338be24e83c49196cc13ff4d49c402bc27ace90] | committer: Stefano Sabatini

ffplay: rename output_picture2() to output_picture()

The "2" suffix is confusing.

Signed-off-by: Stefano Sabatini <stefano.sabatini-lala at poste.it>

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=3338be24e83c49196cc13ff4d49c402bc27ace90
---

 ffplay.c |    6 +++---
 1 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/ffplay.c b/ffplay.c
index 350dcf3..41a2bbc 100644
--- 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)



More information about the ffmpeg-cvslog mailing list