[FFmpeg-cvslog] Merge commit '3193b13aa1e271f6d2dd68de67d448c08aef3c00'

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Mon Dec 24 15:29:15 2012 +0100| [ba8e909c825164a74a4fc580286200a9165e019c] | committer: Michael Niedermayer

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 at gmx.at>

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=ba8e909c825164a74a4fc580286200a9165e019c
---