Browse Source

Merge commit '985f34b75653d02eda8eb8def3412f8577f19b01'

* commit '985f34b75653d02eda8eb8def3412f8577f19b01':
  utils: fix avcodec_flush_buffers pre-reference counting compatibility

Conflicts:
	libavcodec/utils.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
tags/n2.0
Michael Niedermayer 12 years ago
parent
commit
a4a2e894fc
1 changed files with 3 additions and 0 deletions
  1. +3
    -0
      libavcodec/utils.c

+ 3
- 0
libavcodec/utils.c View File

@@ -2666,6 +2666,9 @@ void avcodec_flush_buffers(AVCodecContext *avctx)


avctx->pts_correction_last_pts = avctx->pts_correction_last_pts =
avctx->pts_correction_last_dts = INT64_MIN; avctx->pts_correction_last_dts = INT64_MIN;

if (!avctx->refcounted_frames)
av_frame_unref(&avctx->internal->to_free);
} }


int av_get_exact_bits_per_sample(enum AVCodecID codec_id) int av_get_exact_bits_per_sample(enum AVCodecID codec_id)


Loading…
Cancel
Save