Skip to content

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

Merge commit 'e7fc9796' 

* commit 'e7fc9796':
  lavc: do not use AVCodecContext.codec_name in avcodec_string()

Conflicts:
	libavcodec/utils.c

See: d2d7b713Merged-by: 's avatarMichael Niedermayer <michaelni@gmx.at>
parents b917d702 e7fc9796
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