[FFmpeg-cvslog] wtvenc: simplify write_timestamp

Peter Ross git at videolan.org
Wed Nov 7 13:56:03 CET 2012


ffmpeg | branch: master | Peter Ross <pross at xvid.org> | Wed Nov  7 16:52:21 2012 +1100| [b89cd2a0289fc667d21c8e0f693722ca068ed52b] | committer: Michael Niedermayer

wtvenc: simplify write_timestamp

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

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

 libavformat/wtvenc.c |    6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)

diff --git a/libavformat/wtvenc.c b/libavformat/wtvenc.c
index e078213..9108bc0 100644
--- a/libavformat/wtvenc.c
+++ b/libavformat/wtvenc.c
@@ -372,18 +372,14 @@ static void write_timestamp(AVFormatContext *s, AVPacket *pkt)
     AVIOContext *pb = s->pb;
     WtvContext  *wctx = s->priv_data;
     AVCodecContext *enc = s->streams[pkt->stream_index]->codec;
-    int flag = 0;
 
-    if (enc->codec_type == AVMEDIA_TYPE_VIDEO) {
-        flag = pkt->flags & AV_PKT_FLAG_KEY ? 1 : 0;
-    }
     write_chunk_header(s, &ff_timestamp_guid, 56, 0x40000000 | (INDEX_BASE + pkt->stream_index));
     write_pad(pb, 8);
     avio_wl64(pb, pkt->pts == AV_NOPTS_VALUE ? -1 : pkt->pts);
     avio_wl64(pb, pkt->pts == AV_NOPTS_VALUE ? -1 : pkt->pts);
     avio_wl64(pb, pkt->pts == AV_NOPTS_VALUE ? -1 : pkt->pts);
     avio_wl64(pb, 0);
-    avio_wl64(pb, flag);
+    avio_wl64(pb, enc->codec_type == AVMEDIA_TYPE_VIDEO && (pkt->flags & AV_PKT_FLAG_KEY) ? 1 : 0);
     avio_wl64(pb, 0);
 }
 



More information about the ffmpeg-cvslog mailing list