diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-07-30 17:37:09 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-08-05 04:13:38 +0200 |
| commit | c9f1456a41f58f8e4e9f937bba87bce96f7fd7a5 (patch) | |
| tree | c1ed859cc06517b5c0bd44d51563108381246fa4 | |
| parent | 77b789b4063578e14d59c970b21597739c7f9fd1 (diff) | |
| download | ffmpeg-c9f1456a41f58f8e4e9f937bba87bce96f7fd7a5.tar.gz | |
avfilter/f_select: avoid using doubles for equals checks and casts to enums
This might silence some warnings.
Issue found from: a8d803a320fb08b3ad5db4fffc79abd401206905
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
(cherry picked from commit 887d8d293fc31c949427f971f37c126b3812b451)
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
| -rw-r--r-- | libavfilter/f_select.c | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/libavfilter/f_select.c b/libavfilter/f_select.c index 1ffc00652c..c3756c2bd5 100644 --- a/libavfilter/f_select.c +++ b/libavfilter/f_select.c @@ -342,10 +342,9 @@ static void select_frame(AVFilterContext *ctx, AVFrame *frame) switch (inlink->type) { case AVMEDIA_TYPE_VIDEO: av_log(inlink->dst, AV_LOG_DEBUG, " interlace_type:%c pict_type:%c scene:%f", - select->var_values[VAR_INTERLACE_TYPE] == INTERLACE_TYPE_P ? 'P' : - select->var_values[VAR_INTERLACE_TYPE] == INTERLACE_TYPE_T ? 'T' : - select->var_values[VAR_INTERLACE_TYPE] == INTERLACE_TYPE_B ? 'B' : '?', - av_get_picture_type_char(select->var_values[VAR_PICT_TYPE]), + (!frame->interlaced_frame) ? 'P' : + frame->top_field_first ? 'T' : 'B', + av_get_picture_type_char(frame->pict_type), select->var_values[VAR_SCENE]); break; case AVMEDIA_TYPE_AUDIO: |