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

Merge commit 'ad0c9f2d' 


* commit 'ad0c9f2d':
  lavc: move AVFrame.hwaccel_picture_private to Picture.

Conflicts:
	libavcodec/avcodec.h
	libavcodec/mpegvideo.h

Merged-by: default avatarMichael Niedermayer <michaelni@gmx.at>
parents d9d97f9b ad0c9f2d
No related branches found
No related tags 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