[FFmpeg-cvslog] r16526 - trunk/libavformat/flvenc.c

[bcoudurier]

Author: bcoudurier
Date: Sun Jan 11 06:23:10 2009
New Revision: 16526

Log:
check for negative dts value even if bitstream is already formated,
this fixes dts when stream copying.

Modified:
   trunk/libavformat/flvenc.c

Modified: trunk/libavformat/flvenc.c
==============================================================================
--- trunk/libavformat/flvenc.c	Sun Jan 11 03:19:33 2009	(r16525)
+++ trunk/libavformat/flvenc.c	Sun Jan 11 06:23:10 2009	(r16526)
@@ -340,13 +340,14 @@ static int flv_write_packet(AVFormatCont
         put_byte(pb, FLV_TAG_TYPE_AUDIO);
     }
 
-    if (enc->codec_id == CODEC_ID_H264 &&
+    if (enc->codec_id == CODEC_ID_H264) {
         /* check if extradata looks like mp4 formated */
-        enc->extradata_size > 0 && *(uint8_t*)enc->extradata != 1) {
+        if (enc->extradata_size > 0 && *(uint8_t*)enc->extradata != 1) {
         if (ff_avc_parse_nal_units(pkt->data, &pkt->data, &pkt->size) < 0)
             return -1;
         assert(pkt->size);
         size = pkt->size;
+        }
         /* cast needed to get negative value */
         if (!flv->delay && pkt->dts < 0)
             flv->delay = -pkt->dts;