1
0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2025-01-29 22:00:58 +02:00
FFmpeg/libavcodec
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
..
2012-12-22 00:58:08 +01:00
2012-12-22 00:58:08 +01:00
2012-11-26 11:17:17 -05:00
2012-11-24 10:56:47 +00:00
2012-11-24 10:56:47 +00:00
2012-12-23 11:17:53 +01:00
2012-12-14 20:58:01 +01:00
2012-11-23 15:52:12 +01:00
2012-12-06 19:09:48 +00:00
2012-12-21 00:18:34 +01:00
2012-12-24 04:35:12 +01:00
2012-12-21 00:18:34 +01:00
2012-12-14 01:13:21 +01:00
2012-11-30 15:00:35 +00:00
2012-12-11 20:17:30 +11:00
2012-11-23 18:10:02 +01:00
2012-12-05 19:31:27 +01:00
2012-12-08 01:13:07 +00:00
2012-12-08 01:13:07 +00:00
2012-12-21 00:18:34 +01:00
2012-12-12 17:46:05 +01:00
2012-12-18 01:58:17 +01:00
2012-12-14 00:31:18 +01:00
2012-12-15 11:46:30 +01:00
2012-11-28 16:21:25 +00:00
2012-12-17 20:37:54 +11:00
2012-12-09 22:01:00 +00:00
2012-12-09 22:01:00 +00:00
2012-12-09 22:01:00 +00:00
2012-12-21 00:18:34 +01:00
2012-12-21 00:18:34 +01:00
2012-12-22 00:58:08 +01:00
2012-12-22 00:58:08 +01:00
2012-12-22 00:58:08 +01:00
2012-12-21 00:18:34 +01:00
2012-12-10 11:19:42 -05:00