diff options
author | Michael Niedermayer <michaelni@gmx.at> | 2014-10-18 15:04:42 +0200 |
---|---|---|
committer | Michael Niedermayer <michaelni@gmx.at> | 2014-10-18 15:04:42 +0200 |
commit | c48e8d9dca550327b88106276aed17f87b23b7fe (patch) | |
tree | 22691e94c032d6390a6e1a28c3bcf2dbea2f33c0 /ffmpeg.c | |
parent | fc67d937cc73fb68ab8d840e319e89c52df79c3d (diff) | |
parent | 59b55c494e01de09dfd7cbf9cbbe7223265ac283 (diff) | |
download | ffmpeg-streaming-c48e8d9dca550327b88106276aed17f87b23b7fe.zip ffmpeg-streaming-c48e8d9dca550327b88106276aed17f87b23b7fe.tar.gz |
Merge commit '59b55c494e01de09dfd7cbf9cbbe7223265ac283'
* commit '59b55c494e01de09dfd7cbf9cbbe7223265ac283':
lavc: deprecate unused me_threshold field
Conflicts:
ffmpeg.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'ffmpeg.c')
-rw-r--r-- | ffmpeg.c | 3 |
1 files changed, 1 insertions, 2 deletions
@@ -1009,8 +1009,7 @@ static void do_video_out(AVFormatContext *s, mux_enc->field_order = AV_FIELD_PROGRESSIVE; in_picture->quality = enc->global_quality; - if (!enc->me_threshold) - in_picture->pict_type = 0; + in_picture->pict_type = 0; pts_time = in_picture->pts != AV_NOPTS_VALUE ? in_picture->pts * av_q2d(enc->time_base) : NAN; |