diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2012-10-13 15:00:13 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2012-10-13 15:01:39 +0200 |
| commit | b4ca1b159f4b7f0c3d1e4b2deab686bda934f3a2 (patch) | |
| tree | 519a70950e58fd451aad4bffb53b987a2482068a /ffplay.c | |
| parent | d6c342fdc0b434b514f99e1feaa108ab17bba806 (diff) | |
| parent | bc4620e5d61a4dd9a1f654fadd281a172aab04be (diff) | |
| download | ffmpeg-b4ca1b159f4b7f0c3d1e4b2deab686bda934f3a2.tar.gz | |
Merge commit 'bc4620e5d61a4dd9a1f654fadd281a172aab04be'
* commit 'bc4620e5d61a4dd9a1f654fadd281a172aab04be':
Remove libmpeg2 #define remnants
De-doxygenize some top-level files
Conflicts:
ffmpeg.c
ffmpeg.h
ffmpeg_filter.c
ffplay.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'ffplay.c')
| -rw-r--r-- | ffplay.c | 16 |
1 files changed, 8 insertions, 8 deletions
@@ -100,8 +100,8 @@ typedef struct PacketQueue { #define SUBPICTURE_QUEUE_SIZE 4 typedef struct VideoPicture { - double pts; ///< presentation time stamp for this picture - int64_t pos; ///< byte position in file + double pts; // presentation timestamp for this picture + int64_t pos; // byte position in file int skip; SDL_Overlay *bmp; int width, height; /* source height & width */ @@ -210,13 +210,13 @@ typedef struct VideoState { double frame_last_returned_time; double frame_last_filter_delay; int64_t frame_last_dropped_pos; - double video_clock; ///< pts of last decoded frame / predicted pts of next decoded frame + double video_clock; // pts of last decoded frame / predicted pts of next decoded frame int video_stream; AVStream *video_st; PacketQueue videoq; - double video_current_pts; ///< current displayed pts (different from video_clock if frame fifos are used) - double video_current_pts_drift; ///< video_current_pts - time (av_gettime) at which we updated video_current_pts - used to have running video pts - int64_t video_current_pos; ///< current displayed file pos + double video_current_pts; // current displayed pts (different from video_clock if frame fifos are used) + double video_current_pts_drift; // video_current_pts - time (av_gettime) at which we updated video_current_pts - used to have running video pts + int64_t video_current_pos; // current displayed file pos VideoPicture pictq[VIDEO_PICTURE_QUEUE_SIZE]; int pictq_size, pictq_rindex, pictq_windex; SDL_mutex *pictq_mutex; @@ -230,8 +230,8 @@ typedef struct VideoState { int step; #if CONFIG_AVFILTER - AVFilterContext *in_video_filter; ///< the first filter in the video chain - AVFilterContext *out_video_filter; ///< the last filter in the video chain + AVFilterContext *in_video_filter; // the first filter in the video chain + AVFilterContext *out_video_filter; // the last filter in the video chain int use_dr1; FrameBuffer *buffer_pool; #endif |