diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-02-25 19:03:29 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-02-25 19:03:45 +0100 |
| commit | 0306436416486bf69d268da696d7159c3f29b1b4 (patch) | |
| tree | 95c8f14bac9fb7be59cf5d11a0c3cd25c3f62935 | |
| parent | bc249bd6736f2ba5e8adbcf27b92519e89bd3754 (diff) | |
| parent | ed61f3ca8a0664a697782253b354055136c5d303 (diff) | |
| download | ffmpeg-0306436416486bf69d268da696d7159c3f29b1b4.tar.gz | |
Merge commit 'ed61f3ca8a0664a697782253b354055136c5d303'
* commit 'ed61f3ca8a0664a697782253b354055136c5d303':
parser: Remove commented-out cruft
Merged-by: Michael Niedermayer <michaelni@gmx.at>
| -rw-r--r-- | libavcodec/parser.c | 11 |
1 files changed, 2 insertions, 9 deletions
diff --git a/libavcodec/parser.c b/libavcodec/parser.c index 083ce022b5..4410e45949 100644 --- a/libavcodec/parser.c +++ b/libavcodec/parser.c @@ -98,8 +98,7 @@ void ff_fetch_timestamp(AVCodecParserContext *s, int off, int remove){ if ( s->cur_offset + off >= s->cur_frame_offset[i] && (s->frame_offset < s->cur_frame_offset[i] || (!s->frame_offset && !s->next_frame_offset)) // first field/frame - // check disabled since MPEG-TS does not send complete PES packets - && /*s->next_frame_offset + off <*/ s->cur_frame_end[i]){ + && s->cur_frame_end[i]) { s->dts= s->cur_frame_dts[i]; s->pts= s->cur_frame_pts[i]; s->pos= s->cur_frame_pos[i]; @@ -186,9 +185,7 @@ int av_parser_change(AVCodecParserContext *s, *poutbuf= (uint8_t *) buf; *poutbuf_size= buf_size; if(avctx->extradata){ - if( (keyframe && (avctx->flags2 & CODEC_FLAG2_LOCAL_HEADER)) - /*||(s->pict_type != AV_PICTURE_TYPE_I && (s->flags & PARSER_FLAG_DUMP_EXTRADATA_AT_NOKEY))*/ - /*||(? && (s->flags & PARSER_FLAG_DUMP_EXTRADATA_AT_BEGIN)*/){ + if ((keyframe && (avctx->flags2 & CODEC_FLAG2_LOCAL_HEADER))) { int size= buf_size + avctx->extradata_size; *poutbuf_size= size; *poutbuf= av_malloc(size + FF_INPUT_BUFFER_PADDING_SIZE); @@ -212,8 +209,6 @@ void av_parser_close(AVCodecParserContext *s) } } -/*****************************************************/ - int ff_combine_frame(ParseContext *pc, int next, const uint8_t **buf, int *buf_size) { if(pc->overread){ @@ -290,8 +285,6 @@ void ff_parse_close(AVCodecParserContext *s) av_freep(&pc->buffer); } -/*************************/ - int ff_mpeg4video_split(AVCodecContext *avctx, const uint8_t *buf, int buf_size) { |