diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-08-15 21:31:59 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-08-15 22:47:45 +0200 |
| commit | 81a663f49edd265dc846ff3854579415cac1d5bb (patch) | |
| tree | 316eba8de3800371865b42b36831e9829bf775f7 /ffmpeg.c | |
| parent | 60dbed6067676d847157fe530b1caed06c77e2ab (diff) | |
| download | ffmpeg-streaming-81a663f49edd265dc846ff3854579415cac1d5bb.zip ffmpeg-streaming-81a663f49edd265dc846ff3854579415cac1d5bb.tar.gz | |
Drop remaining unneeded != NULL
Reviewed-by: Clément Bœsch <u@pkh.me>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'ffmpeg.c')
| -rw-r--r-- | ffmpeg.c | 2 |
1 files changed, 1 insertions, 1 deletions
@@ -2071,7 +2071,7 @@ static int process_input_packet(InputStream *ist, const AVPacket *pkt) if (!ist->saw_first_ts) { ist->dts = ist->st->avg_frame_rate.num ? - ist->dec_ctx->has_b_frames * AV_TIME_BASE / av_q2d(ist->st->avg_frame_rate) : 0; ist->pts = 0; - if (pkt != NULL && pkt->pts != AV_NOPTS_VALUE && !ist->decoding_needed) { + if (pkt && pkt->pts != AV_NOPTS_VALUE && !ist->decoding_needed) { ist->dts += av_rescale_q(pkt->pts, ist->st->time_base, AV_TIME_BASE_Q); ist->pts = ist->dts; //unused but better to set it to a value thats not totally wrong } |
