---
If this is OK I think I will reorder it to go in before the K&R patch.
libavcodec/parser.c | 7 +------
1 file changed, 1 insertion(+), 6 deletions(-)
diff --git a/libavcodec/parser.c b/libavcodec/parser.c
index 7725af1..59f10e0 100644
--- a/libavcodec/parser.c
+++ b/libavcodec/parser.c
@@ -103,9 +103,6 @@ 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->dts = s->cur_frame_dts[i];
s->pts = s->cur_frame_pts[i];
@@ -189,9 +186,7 @@ int av_parser_change(AVCodecParserContext *s,
AVCodecContext *avctx,
*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;
--
1.7.9.5
_______________________________________________
libav-devel mailing list
[email protected]
https://lists.libav.org/mailman/listinfo/libav-devel
