summaryrefslogtreecommitdiff
path: root/ffplay.c
diff options
context:
space:
mode:
authorStefano Sabatini <stefano.sabatini-lala@poste.it>2010-05-03 00:03:49 +0200
committerStefano Sabatini <stefano.sabatini-lala@poste.it>2011-04-12 01:37:00 +0200
commit3338be24e83c49196cc13ff4d49c402bc27ace90 (patch)
tree88a8aaeae63178c9b1c7763eeba6023b2f84b3fe /ffplay.c
parent1979d3b8a5821a48c30c0dec3ac9aa183d52c577 (diff)
ffplay: rename output_picture2() to output_picture()
The "2" suffix is confusing. Signed-off-by: Stefano Sabatini <stefano.sabatini-lala@poste.it>
Diffstat (limited to 'ffplay.c')
-rw-r--r--ffplay.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/ffplay.c b/ffplay.c
index 350dcf3ff0..41a2bbc155 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)