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

Merge commit 'a3f4c930' 


* commit 'a3f4c930':
  mpegvideo: Have ff_mpeg_ref_picture use AVCodecContext directly

Conflicts:
	libavcodec/mpegvideo.c

Merged-by: default avatarMichael Niedermayer <michaelni@gmx.at>
parents a25ee5f9 a3f4c930
No related branches found
No related tags found
No related merge requests found
Hide whitespace changes
Inline Side-by-side
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment