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

Merge commit 'bc98e8c0' 


* commit 'bc98e8c0':
  h264: move mb_field_decoding_flag into the per-slice context

Conflicts:
	libavcodec/h264_slice.c

Merged-by: default avatarMichael Niedermayer <michaelni@gmx.at>
parents a0b39747 bc98e8c0
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