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

Merge commit '3193b13a'


* commit '3193b13a':
  hlsenc: Allocate enough space for the pattern string
  lavc: Correct the description of pkt_dts
  avfilter: Compile FIFO filters unconditionally

Conflicts:
	libavcodec/avcodec.h
	libavfilter/Makefile
	libavfilter/allfilters.c

Merged-by: default avatarMichael Niedermayer <michaelni@gmx.at>
parents d69238e9 3193b13a
No related branches found
No related tags found
No related merge requests found
Loading
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment