Skip to content

F
ffmpeg.wasm-core
Commit ea7e4f8e authored by Michael Niedermayer's avatar Michael Niedermayer
Browse files
Options

Merge commit 'b7040e67' 

* commit 'b7040e67':
  h264: fix AVDISCARD_NONKEY for some interlaced content

Conflicts:
	libavcodec/h264.c

Not merged, the used field is not initialized where it is used
Merged-by: 's avatarMichael Niedermayer <michael@niedermayer.cc>
parents e1296b5f b7040e67
Hide whitespace changes
Inline Side-by-side
Showing with 0 additions and 0 deletions
Markdown is supported
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