Skip to content

F
ffmpeg
Commit 1dc53463 authored by Michael Niedermayer's avatar Michael Niedermayer
Browse files
Options

Merge commit 'da35008c' into release/2.4 

* commit 'da35008c':
  latm: Do not give a score for a single instance

Conflicts:
	libavformat/rawdec.c
Merged-by: 's avatarMichael Niedermayer <michaelni@gmx.at>
parents 705e0e05 da35008c
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