Merge remote-tracking branch 'luzero/pulse'

* luzero/pulse:
  pulse: set the device from the avformat filename

Conflicts:
	libavdevice/pulse.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>

diff --cc libavdevice/pulse.c
index 94bb32ff5ed3f00f79f20d9b6af28f744c790e9a,66b62cc99dbba83f257caaa43b4c448c63678e8b..56ae32385604de111591fe78eb1782d5c284f621
--- 1/libavdevice/pulse.c
--- 2/libavdevice/pulse.c
+++ b/libavdevice/pulse.c
@@@ -162,13 -163,20 +163,20 @@@ static av_cold int pulse_close(AVFormat
  #define D AV_OPT_FLAG_DECODING_PARAM
  
  static const AVOption options[] = {
-     { "server",      "pulse server name",   OFFSET(server),      AV_OPT_TYPE_STRING, {.str = NULL},    0, 0, D },
-     { "name",        "application name",    OFFSET(name),        AV_OPT_TYPE_STRING, {.str = LIBAVFORMAT_IDENT}, 0, 0, D },
-     { "dev",         "device to use",       OFFSET(dev),         AV_OPT_TYPE_STRING, {.str = NULL},    0, 0, D },
-     { "stream_name", "stream description",  OFFSET(stream_name), AV_OPT_TYPE_STRING, {.str = "record"},    0, 0, D },
-     { "sample_rate", "",                    OFFSET(sample_rate), AV_OPT_TYPE_INT,    {.dbl = 48000},   1, INT_MAX, D },
-     { "channels",    "",                    OFFSET(channels),    AV_OPT_TYPE_INT,    {.dbl = 2},       1, INT_MAX, D },
-     { "frame_size",  "",                    OFFSET(frame_size),  AV_OPT_TYPE_INT,    {.dbl = 1024},    1, INT_MAX, D },
+     { "server",        "pulse server name",
+         OFFSET(server),        AV_OPT_TYPE_STRING, {.str = NULL},     0, 0, D },
+     { "name",          "application name",
 -        OFFSET(name),          AV_OPT_TYPE_STRING, {.str = "libav"},  0, 0, D },
++        OFFSET(name),          AV_OPT_TYPE_STRING, {.str = LIBAVFORMAT_IDENT},  0, 0, D },
+     { "stream_name",   "stream description",
+         OFFSET(stream_name),   AV_OPT_TYPE_STRING, {.str = "record"}, 0, 0, D },
+     { "sample_rate",   "",
+         OFFSET(sample_rate),   AV_OPT_TYPE_INT,    {.dbl = 48000},    1, INT_MAX, D },
+     { "channels",      "",
+         OFFSET(channels),      AV_OPT_TYPE_INT,    {.dbl = 2},        1, INT_MAX, D },
+     { "frame_size",    "",
+         OFFSET(frame_size),    AV_OPT_TYPE_INT,    {.dbl = 1024},     1, INT_MAX, D },
+     { "fragment_size", "buffering size, affects latency and cpu usage",
+         OFFSET(fragment_size), AV_OPT_TYPE_INT,    {.dbl = -1},      -1, INT_MAX, D },
      { NULL },
  };