[FFmpeg-cvslog] avformat/utils: factorize h264/hevc checks out in compute_pkt_fields()

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Sat Feb 22 12:21:28 2014 +0100| [f288e1b67cbab43c0591483ea323ce1e83df74cb] | committer: Michael Niedermayer

avformat/utils: factorize h264/hevc checks out in compute_pkt_fields()

Signed-off-by: Michael Niedermayer <michaelni at gmx.at>

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=f288e1b67cbab43c0591483ea323ce1e83df74cb
---

 libavformat/utils.c |    8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/libavformat/utils.c b/libavformat/utils.c
index 04c10a0..cb048f9 100644
--- a/libavformat/utils.c
+++ b/libavformat/utils.c
@@ -1072,6 +1072,8 @@ static void compute_pkt_fields(AVFormatContext *s, AVStream *st,
     int num, den, presentation_delayed, delay, i;
     int64_t offset;
     AVRational duration;
+    int onein_oneout = st->codec->codec_id != AV_CODEC_ID_H264 &&
+                       st->codec->codec_id != AV_CODEC_ID_HEVC;
 
     if (s->flags & AVFMT_FLAG_NOFILLIN)
         return;
@@ -1154,8 +1156,7 @@ static void compute_pkt_fields(AVFormatContext *s, AVStream *st,
     /* Interpolate PTS and DTS if they are not present. We skip H264
      * currently because delay and has_b_frames are not reliably set. */
     if ((delay == 0 || (delay == 1 && pc)) &&
-        st->codec->codec_id != AV_CODEC_ID_H264 &&
-        st->codec->codec_id != AV_CODEC_ID_HEVC) {
+        onein_oneout) {
         if (presentation_delayed) {
             /* DTS = decompression timestamp */
             /* PTS = presentation timestamp */
@@ -1200,8 +1201,7 @@ static void compute_pkt_fields(AVFormatContext *s, AVStream *st,
             pkt->dts = st->pts_buffer[0];
     }
     // We skipped it above so we try here.
-    if (st->codec->codec_id == AV_CODEC_ID_H264 ||
-        st->codec->codec_id == AV_CODEC_ID_HEVC)
+    if (!onein_oneout)
         // This should happen on the first packet
         update_initial_timestamps(s, pkt->stream_index, pkt->dts, pkt->pts, pkt);
     if (pkt->dts > st->cur_dts)