Files
ffmpeg-rockchip/libavcodec
Michael Niedermayer f7d4e26c6a Merge remote-tracking branch 'qatar/master'
* qatar/master:
  rtmp: Add a new option 'rtmp_pageurl'
  doc: Update the description of the rtmp_tcurl option
  rtmp: Make the description of the rtmp_tcurl option more generic
  libfdk-aacenc: add LATM/LOAS encapsulation support
  sctp: add port missing error message
  tcp: add port missing error message
  avfilter: Fix printf format string conversion specifier

Conflicts:
	libavcodec/version.h
	libavfilter/avfilter.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
2012-07-25 22:00:06 +02:00
..
2012-07-19 18:44:46 +02:00
2012-07-11 04:04:29 +02:00
2012-07-22 07:58:54 +02:00
2012-07-22 05:23:27 +02:00
2012-07-25 09:26:17 +02:00
2012-07-23 23:54:13 +02:00
2012-07-19 18:44:46 +02:00
2012-07-10 02:17:53 +02:00
2012-07-10 02:17:52 +02:00
2012-07-10 02:17:52 +02:00
2012-07-10 02:17:52 +02:00
2012-07-24 05:17:36 +02:00
2012-07-25 21:35:30 +02:00
2012-07-22 05:18:01 +02:00
2012-07-12 23:18:48 +02:00
2012-07-17 08:53:36 +02:00
2012-07-25 21:35:48 +02:00
2012-07-22 07:58:54 +02:00
2012-07-18 16:22:41 +02:00
2012-07-10 19:38:24 +02:00
2012-07-09 15:38:28 +02:00
2012-07-09 15:38:16 +02:00
2012-07-08 17:59:56 +02:00
2012-07-17 17:06:24 +00:00
2012-07-15 14:49:32 +02:00
2012-07-07 22:33:13 +00:00
2012-07-08 23:43:18 +00:00
2012-07-17 01:23:35 +00:00
2012-07-17 01:23:35 +00:00
2012-07-14 13:02:51 +02:00
2012-07-23 23:44:13 +02:00
2012-07-23 22:12:12 +02:00
2012-07-11 23:26:55 +02:00