ffmpeg/tests/ref
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
..
acodec matroskaenc: don't write an empty Cues element. 2011-04-07 18:11:24 +02:00
fate lavf: inspect more frames for fps when container time base is coarse 2011-04-03 03:18:06 +02:00
lavf Merge remote branch 'qatar/master' 2011-04-05 02:31:56 +02:00
lavfi Fix yuvj420p scaling artefact, issue1108. 2011-04-03 16:40:11 +02:00
seek ac3enc: select bandwidth based on bit rate, sample rate, and number of 2011-04-03 20:59:14 -04:00
vsynth1
vsynth2