Skip to content
Snippets Groups Projects
Commit a25ee5f9 authored by Michael Niedermayer's avatar Michael Niedermayer
Browse files

Merge commit 'd5280455' 


* commit 'd5280455':
  mpegvideo: Have ff_mpeg_unref_picture use AVCodecContext directly

Conflicts:
	libavcodec/mpegvideo.c
	libavcodec/mpegvideo_enc.c

The memset is left in place

Merged-by: default avatarMichael Niedermayer <michaelni@gmx.at>
parents bc373595 d5280455
Branches
Tags
Hide whitespace changes
Inline Side-by-side
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment