Files
FFmpeg/libavcodec
Michael Niedermayer c88caa522c Merge remote branch 'qatar/master'
* qatar/master:
  proto: include os_support.h in network.h
  matroskaenc: don't write an empty Cues element.
  lavc: add a FF_API_REQUEST_CHANNELS deprecation macro
  avio: move extern url_interrupt_cb declaration from avio.h to url.h
  avio: make av_register_protocol2 internal.
  avio: avio_ prefix for url_set_interrupt_cb.
  avio: AVIO_ prefixes for URL_ open flags.
  proto: introduce listen option in tcp
  doc: clarify configure features
  proto: factor ff_network_wait_fd and use it on udp

Conflicts:
	ffmpeg.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
2011-04-08 02:50:13 +02:00
..
2011-04-06 02:59:49 +02:00
2011-04-05 02:31:56 +02:00
2011-04-06 02:59:49 +02:00
2011-04-05 02:31:56 +02:00
2011-04-05 02:31:56 +02:00
2011-04-05 02:31:56 +02:00
2011-03-28 00:16:44 +02:00
2011-03-28 00:16:44 +02:00
2011-04-08 02:50:13 +02:00
2011-04-02 18:19:01 +02:00
2011-04-02 19:26:58 +02:00
2011-04-03 16:40:10 +02:00
2011-04-02 01:54:27 +02:00
2011-04-04 02:15:12 +02:00
2011-04-04 02:15:12 +02:00
2011-04-03 02:28:01 +02:00
2011-04-03 02:28:01 +02:00
2011-04-08 00:20:18 +02:00
2011-04-03 02:28:01 +02:00
2011-04-02 01:54:27 +02:00
2011-03-28 21:50:46 -07:00
2011-04-06 23:21:44 +02:00
2011-04-06 01:09:04 +02:00
2011-04-06 01:09:04 +02:00
2011-04-08 02:50:13 +02:00
2011-04-07 03:32:26 +02:00
2011-04-06 02:59:49 +02:00
2011-04-03 16:40:12 +02:00
2011-04-03 16:40:12 +02:00
2011-04-03 02:28:01 +02:00
2011-03-19 15:24:31 +00:00
2011-03-28 00:16:44 +02:00
2011-04-03 02:28:01 +02:00
2011-04-03 02:28:01 +02:00
2011-04-06 02:59:49 +02:00
2011-04-04 15:35:03 +02:00