virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2025-03-28 12:32:17 +02:00
Code Issues Releases Activity

parser: Remove commented-out cruft

Browse Source
This commit is contained in:
Diego Biurrun 2014-02-25 11:59:05 +01:00
parent 5ea14d48a8
commit ed61f3ca8a
1 changed files with 2 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
libavcodec/parser.c
View File

@ -97,8 +97,7 @@ void ff_fetch_timestamp(AVCodecParserContext *s, int off, int remove){
if ( s->cur_offset + off >= s->cur_frame_offset[i] if ( s->cur_offset + off >= s->cur_frame_offset[i]
&& (s->frame_offset < s->cur_frame_offset[i] || && (s->frame_offset < s->cur_frame_offset[i] ||
(!s->frame_offset && !s->next_frame_offset)) // first field/frame (!s->frame_offset && !s->next_frame_offset)) // first field/frame
// check disabled since MPEG-TS does not send complete PES packets && s->cur_frame_end[i]) {
&& /*s->next_frame_offset + off <*/ s->cur_frame_end[i]){
s->dts= s->cur_frame_dts[i]; s->dts= s->cur_frame_dts[i];
s->pts= s->cur_frame_pts[i]; s->pts= s->cur_frame_pts[i];
s->pos= s->cur_frame_pos[i]; s->pos= s->cur_frame_pos[i];
@ -185,9 +184,7 @@ int av_parser_change(AVCodecParserContext *s,
*poutbuf= (uint8_t *) buf; *poutbuf= (uint8_t *) buf;
*poutbuf_size= buf_size; *poutbuf_size= buf_size;
if(avctx->extradata){ if(avctx->extradata){
if( (keyframe && (avctx->flags2 & CODEC_FLAG2_LOCAL_HEADER)) 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)*/){
int size= buf_size + avctx->extradata_size; int size= buf_size + avctx->extradata_size;
*poutbuf_size= size; *poutbuf_size= size;
*poutbuf= av_malloc(size + FF_INPUT_BUFFER_PADDING_SIZE); *poutbuf= av_malloc(size + FF_INPUT_BUFFER_PADDING_SIZE);
@ -211,8 +208,6 @@ void av_parser_close(AVCodecParserContext *s)
} }
} }
/*****************************************************/
int ff_combine_frame(ParseContext *pc, int next, const uint8_t **buf, int *buf_size) int ff_combine_frame(ParseContext *pc, int next, const uint8_t **buf, int *buf_size)
{ {
if(pc->overread){ if(pc->overread){
@ -285,8 +280,6 @@ void ff_parse_close(AVCodecParserContext *s)
av_freep(&pc->buffer); av_freep(&pc->buffer);
} }
/*************************/
int ff_mpeg4video_split(AVCodecContext *avctx, int ff_mpeg4video_split(AVCodecContext *avctx,
const uint8_t *buf, int buf_size) const uint8_t *buf, int buf_size)
{ {