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

Merge commit '0c03cc68' 


* commit '0c03cc68':
  mp3: exit on parsing error in mp_decode_frame
  rtmppkt: Avoid unescaped backslash in Doxygen comment
  fate-lavfi: replace sed/grep/cut combos with awk
  build: Plan 9 support

Conflicts:
	configure
	tests/lavfi-regression.sh

Merged-by: default avatarMichael Niedermayer <michaelni@gmx.at>
parents 42ee9f39 0c03cc68
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