Michael Niedermayer ba8e909c82 Merge commit '3193b13aa1e271f6d2dd68de67d448c08aef3c00' ...

* commit '3193b13aa1e271f6d2dd68de67d448c08aef3c00':
  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: Michael Niedermayer <michaelni@gmx.at>

2012-12-24 15:29:15 +01:00

167 KiB

Raw Blame History

View Raw