Files
ffmpeg-rockchip/libavformat
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-06-20 01:56:03 +00:00
2012-07-06 17:08:22 +02:00
2012-06-09 10:57:14 +00:00
2012-05-10 04:17:03 +02:00
2012-05-31 23:50:08 +02:00
2012-05-07 02:42:00 +02:00
2012-06-16 17:59:01 +02:00
2012-07-25 17:40:33 +02:00
2012-07-06 17:08:22 +02:00
2012-07-06 17:08:22 +02:00
2012-07-23 21:46:28 +00:00
2012-07-10 13:27:16 +02:00
2012-07-03 09:53:42 +00:00
2012-05-21 08:51:50 +02:00
2012-07-20 11:19:01 +02:00
2012-07-25 09:26:17 +02:00
2012-07-25 09:26:17 +02:00
2012-06-11 07:35:14 +02:00
2012-06-13 18:51:38 +02:00
2012-07-12 23:16:52 +02:00
2012-07-05 04:23:55 +02:00
2012-07-20 11:16:52 +02:00
2012-07-20 11:16:52 +02:00
2012-04-18 15:30:34 +02:00
2012-07-08 20:49:04 +00:00
2012-06-14 23:52:23 +02:00
2012-06-14 23:52:40 +02:00
2012-06-21 20:52:56 +02:00
2012-06-29 20:22:04 +02:00
2012-06-29 20:21:28 +02:00
2012-07-25 20:31:16 +03:00
2012-07-08 20:49:35 +00:00
2012-06-21 20:52:56 +02:00
2012-05-18 23:34:11 +02:00
2012-06-07 21:30:07 +02:00
2012-07-22 19:12:15 +02:00
2012-06-25 16:20:08 +03:00
2012-07-06 17:08:22 +02:00
2012-07-06 17:08:22 +02:00