[FFmpeg-cvslog] r19196 - trunk/ffmpeg.c

[bcoudurier]

Author: bcoudurier
Date: Mon Jun 15 01:55:25 2009
New Revision: 19196

Log:
do not use av_parser_change for h264 which uses bitstream filter, fix #1027

Modified:
   trunk/ffmpeg.c

Modified: trunk/ffmpeg.c
==============================================================================
--- trunk/ffmpeg.c	Mon Jun 15 01:14:56 2009	(r19195)
+++ trunk/ffmpeg.c	Mon Jun 15 01:55:25 2009	(r19196)
@@ -1407,8 +1407,13 @@ static int output_packet(AVInputStream *
                         opkt.flags= pkt->flags;
 
                         //FIXME remove the following 2 lines they shall be replaced by the bitstream filters
+                        if(ost->st->codec->codec_id != CODEC_ID_H264) {
                         if(av_parser_change(ist->st->parser, ost->st->codec, &opkt.data, &opkt.size, data_buf, data_size, pkt->flags & PKT_FLAG_KEY))
                             opkt.destruct= av_destruct_packet;
+                        } else {
+                            opkt.data = data_buf;
+                            opkt.size = data_size;
+                        }
 
                         write_frame(os, &opkt, ost->st->codec, bitstream_filters[ost->file_index][opkt.stream_index]);
                         ost->st->codec->frame_number++;