Merge from 1.2 tip.

--HG--
rename : src/combined/ffmpeg/ff_dvaudio_decoder.c => src/audio_dec/ff_dvaudio_decoder.c

1 files changed, 0 insertions, 23 deletions

diff --git a/src/input/net_buf_ctrl.c b/src/input/net_buf_ctrl.c
index aaf575e40..03a24d38f 100644
--- a/src/input/net_buf_ctrl.c
+++ b/src/input/net_buf_ctrl.c
@@ -113,10 +113,6 @@ static void nbc_set_speed_normal (nbc_t *this) {
   stream->xine->clock->set_option (stream->xine->clock, CLOCK_SCR_ADJUSTABLE, 1);
 }
 
-void nbc_check_buffers (nbc_t *this) {
-  /* Deprecated */
-}
-
 static void display_stats (nbc_t *this) {
   static const char buffering[2][4] = {"   ", "buf"};
   static const char enabled[2][4]   = {"off", "on "};
@@ -564,22 +560,3 @@ void nbc_close (nbc_t *this) {
   free (this);
   xprintf(xine, XINE_VERBOSITY_DEBUG, "\nnet_buf_ctrl: nbc_close: done\n");
 }
-
-
-void nbc_set_high_water_mark(nbc_t *this, int value) {
-/*
-  Deprecated
-  this->high_water_mark = value;
-*/
-  xprintf(this->stream->xine, XINE_VERBOSITY_DEBUG,
-	  "\nnet_buf_ctrl: this method is deprecated, please fix the input plugin\n");
-}
-
-void nbc_set_low_water_mark(nbc_t *this, int value) {
-/*
-  Deprecated
-  this->low_water_mark = value;
-*/
-  xprintf(this->stream->xine, XINE_VERBOSITY_DEBUG,
-	  "\nnet_buf_ctrl: this method is deprecated, please fix the input plugin\n");
-}