RepoMirrors/ffmpeg
1
0
Fork 0
mirror of https://git.ffmpeg.org/ffmpeg.git synced 2024-12-25 16:52:31 +00:00
Code Issues Projects Releases Wiki Activity

Merge commit '985f34b75653d02eda8eb8def3412f8577f19b01'

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

Conflicts:
	libavcodec/utils.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
This commit is contained in:
Michael Niedermayer 2013-06-17 00:21:22 +02:00
commit a4a2e894fc
1 changed files with 3 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
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)