Merge commit '3193b13aa1e271f6d2dd68de67d448c08aef3c00'
authorMichael Niedermayer <michaelni@gmx.at>
Mon, 24 Dec 2012 14:29:15 +0000 (15:29 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Mon, 24 Dec 2012 14:29:15 +0000 (15:29 +0100)
commitba8e909c825164a74a4fc580286200a9165e019c
tree8593a7a5d08917fdef2dfdf3b6799d561bb2f8a9
parentd69238e991844cb0e9407c26e64dd7a551aa5bab
parent3193b13aa1e271f6d2dd68de67d448c08aef3c00
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>
libavcodec/avcodec.h
libavfilter/Makefile
libavfilter/allfilters.c